diff options
author | yueg <yueg@google.com> | 2017-12-01 01:06:21 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-12-01 01:06:21 +0000 |
commit | f81e935326f41bc7173bfa6edf37fee7e59646c0 (patch) | |
tree | f900a243f082a4ecf930b0e042d3ec786174bbc6 | |
parent | 36b25c52d81ec021d217f9b9a2022d292fa89d8e (diff) | |
parent | 9db815f0513b114fd6044f661b39f8e6c9783c65 (diff) |
Merge changes Ide2ea08f,I24186745
am: 9db815f051
Change-Id: I8fdf785b6ac3c16b2d9ecabdbdcc3a7131124c10
-rw-r--r-- | java/com/android/incallui/contactgrid/ContactGridManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
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); |