diff options
Diffstat (limited to 'java/com/android/incallui')
4 files changed, 10 insertions, 6 deletions
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index d854a7fc8..af9970056 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="23" - android:targetSdkVersion="26"/> + android:targetSdkVersion="27"/> <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/> <!-- We use this to disable the status bar buttons of home, back and recent diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java index 95da1c65e..d3d993027 100644 --- a/java/com/android/incallui/NewReturnToCallController.java +++ b/java/com/android/incallui/NewReturnToCallController.java @@ -219,11 +219,15 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au } private void onPhotoAvatarReceived(@NonNull Drawable photo) { - bubble.updatePhotoAvatar(photo); + if (bubble != null) { + bubble.updatePhotoAvatar(photo); + } } private void onLetterTileAvatarReceived(@NonNull Drawable photo) { - bubble.updateAvatar(photo); + if (bubble != null) { + bubble.updateAvatar(photo); + } } private NewBubbleInfo generateBubbleInfo() { diff --git a/java/com/android/incallui/autoresizetext/AndroidManifest.xml b/java/com/android/incallui/autoresizetext/AndroidManifest.xml index 1b5c19355..e26670e52 100644 --- a/java/com/android/incallui/autoresizetext/AndroidManifest.xml +++ b/java/com/android/incallui/autoresizetext/AndroidManifest.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="23" - android:targetSdkVersion="26"/> + android:targetSdkVersion="27"/> <application /> </manifest> diff --git a/java/com/android/incallui/video/protocol/AndroidManifest.xml b/java/com/android/incallui/video/protocol/AndroidManifest.xml index cfb6b27ad..6f6558278 100644 --- a/java/com/android/incallui/video/protocol/AndroidManifest.xml +++ b/java/com/android/incallui/video/protocol/AndroidManifest.xml @@ -18,5 +18,5 @@ package="com.android.incallui.video.protocol"> <uses-sdk android:minSdkVersion="23" - android:targetSdkVersion="26"/> -</manifest>
\ No newline at end of file + android:targetSdkVersion="27"/> +</manifest> |