summaryrefslogtreecommitdiff
path: root/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'java/com')
-rw-r--r--java/com/android/incallui/NewReturnToCallController.java12
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));
+ }
}
}
}