From 5c030d765169de44f685cd4782e888bc12ec6be3 Mon Sep 17 00:00:00 2001 From: yueg Date: Tue, 9 Jan 2018 15:50:08 -0800 Subject: 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: Icabaeccc96e039c8ac53d66c23af89d3eb0823a9 --- java/com/android/incallui/NewReturnToCallController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'java/com/android/incallui') 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)); + } } } } -- cgit v1.2.3