diff options
| author | yueg <yueg@google.com> | 2018-01-09 15:50:08 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-01-09 17:36:49 -0800 |
| commit | b8abb9df1b7289b5184e5a27aa67972658726de5 (patch) | |
| tree | e017fe09b848af718c24708397e874dfcfa2807d | |
| parent | e428c77d2c47ff975d3585666fe70fd45d08a3e3 (diff) | |
Fix NPE in NewReturnToCallController.createLettleTileDrawable().
After searching contact info, the associated dialer call object might be removed from CallList, which causes NPE.
Test: NewReturnToCallControllerTest
PiperOrigin-RevId: 181387022
Change-Id: I09b9bf037fbd3d675ef821259ec23c1355a647df
| -rw-r--r-- | java/com/android/incallui/NewReturnToCallController.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java index ca60a52c1..b8798b1b9 100644 --- a/java/com/android/incallui/NewReturnToCallController.java +++ b/java/com/android/incallui/NewReturnToCallController.java @@ -318,8 +318,10 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au newReturnToCallController.onPhotoAvatarReceived(entry.photo); } else { DialerCall dialerCall = CallList.getInstance().getCallById(callId); - newReturnToCallController.onLetterTileAvatarReceived( - newReturnToCallController.createLettleTileDrawable(dialerCall, entry)); + if (dialerCall != null) { + newReturnToCallController.onLetterTileAvatarReceived( + newReturnToCallController.createLettleTileDrawable(dialerCall, entry)); + } } } @@ -334,8 +336,10 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au newReturnToCallController.onPhotoAvatarReceived(entry.photo); } else { DialerCall dialerCall = CallList.getInstance().getCallById(callId); - newReturnToCallController.onLetterTileAvatarReceived( - newReturnToCallController.createLettleTileDrawable(dialerCall, entry)); + if (dialerCall != null) { + newReturnToCallController.onLetterTileAvatarReceived( + newReturnToCallController.createLettleTileDrawable(dialerCall, entry)); + } } } } |