From 26d36b233363b3770d396b2ddf7a682837bff228 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 30 Nov 2017 11:51:52 -0800 Subject: Fix NPE crash on video call. Bug: 69960961 Test: manual PiperOrigin-RevId: 177486235 Change-Id: I241867456830e0a8479ed0652aac71abc77c86e3 --- java/com/android/incallui/contactgrid/ContactGridManager.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java/com/android/incallui/contactgrid/ContactGridManager.java') diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java index 6574aa82f..58d318892 100644 --- a/java/com/android/incallui/contactgrid/ContactGridManager.java +++ b/java/com/android/incallui/contactgrid/ContactGridManager.java @@ -400,6 +400,10 @@ public class ContactGridManager { } private void updateDeviceNumberRow() { + // It might not be available, e.g. in video call. + if (deviceNumberTextView == null) { + return; + } if (isInMultiWindowMode || TextUtils.isEmpty(primaryCallState.callbackNumber)) { deviceNumberTextView.setVisibility(View.GONE); deviceNumberDivider.setVisibility(View.GONE); -- cgit v1.2.3