commit 5c030d765169de44f685cd4782e888bc12ec6be3
author yueg <yueg@google.com> Tue Jan 09 15:50:08 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Jan 09 17:33:39 2018 -0800
tree e017fe09b848af718c24708397e874dfcfa2807d
parent e428c77d2c47ff975d3585666fe70fd45d08a3e3

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

diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java
index ca60a52..b8798b1 100644
--- a/java/com/android/incallui/NewReturnToCallController.java
+++ b/java/com/android/incallui/NewReturnToCallController.java
@@ -318,8 +318,10 @@
         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 @@
         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));
+        }
       }
     }
   }