diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-18 23:22:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-18 23:22:56 +0000 |
| commit | 4c82c25182adb9892e8cb770bfc6003b59c53cc9 (patch) | |
| tree | a2fc282d10c9f5f7e562ed22e1d872d6baedca02 /java/com/android/incallui/NewReturnToCallController.java | |
| parent | 01de7aaefd290672eeb1ff0c6601466590cd9563 (diff) | |
| parent | d3d268c5c38f12e79d3da0161bb19da4de232f3f (diff) | |
Merge changes I05dc2ddd,Ic6bfd4ab,I58557f77
* changes:
Added tests for latin smart dial map.
Upgrade target SDK version to 27.
Bubble v2 animation change.
Diffstat (limited to 'java/com/android/incallui/NewReturnToCallController.java')
| -rw-r--r-- | java/com/android/incallui/NewReturnToCallController.java | 8 |
1 files changed, 6 insertions, 2 deletions
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() { |