commit af947faa14e8c77fe4d3a90927d0f11b42eb7e3f
author Andrew Lee <anwlee@google.com> Fri Jul 18 17:12:04 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 18:11:21 2014 +0000
tree 4510d94991546da9f42340f878913a3b951cc2de
parent 9148c11f4d9a88b8603e98471d76ac43aca54e2a
parent 2ee65e79ee71959d2ca26a6a3ec317d3a80b28e9

Merge "Add new buttons for video calls." into lmp-dev

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index eb46403..5ba67ff 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -210,9 +210,11 @@
     public void onDetailsChanged(android.telecomm.Call.Details details) {
         getUi().setCallDetails(details);
 
-        String currentNumber = mPrimary.getHandle().getSchemeSpecificPart();
-        if (PhoneNumberUtils.isEmergencyNumber(currentNumber)) {
-            setEmergencyNumberIfSet(details);
+        if (mPrimary != null) {
+            String currentNumber = mPrimary.getHandle().getSchemeSpecificPart();
+            if (PhoneNumberUtils.isEmergencyNumber(currentNumber)) {
+                setEmergencyNumberIfSet(details);
+            }
         }
     }