Merge changes Ide2ea08f,I24186745

* changes:
  Rollback Broadcast in-call UI changes.
  Fix NPE crash on video call.

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);