commit 6fc722d72a000793e33a57db660e3116c6defd97
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 19 03:48:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 19 03:48:51 2017 +0000
tree 671e13a7339df38eda9d034dedc3b698499cd4dd
parent a4ae7509ef40502b7ad5f63c882a616dbcc4625a
parent 270f1237e4d3fff509e514225627517832699f58

Merge "Fix NPE in MissedCallNotifierImpl"

src/com/android/server/telecom/ui/MissedCallNotifierImpl.java

diff --git a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
index 3b8e7e0..863c393 100644
--- a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
+++ b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
@@ -625,8 +625,10 @@
                                                                 "different handle.");
                                                 return;
                                             }
-                                            if (info.contactDisplayPhotoUri == null) {
-                                                // If there is no photo, just show the notification.
+                                            if (info == null ||
+                                                    info.contactDisplayPhotoUri == null) {
+                                                // If there is no photo or if the caller info is
+                                                // null, just show the notification.
                                                 CallInfo callInfo = callInfoFactory.makeCallInfo(
                                                         info, null, handle, date);
                                                 showMissedCallNotification(callInfo, userHandle);