diff options
| author | Ihab Awad <ihab@google.com> | 2014-07-18 14:34:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 21:58:28 +0000 |
| commit | 9148c11f4d9a88b8603e98471d76ac43aca54e2a (patch) | |
| tree | 44623256f43abc49f744804f6762767da24cdccd | |
| parent | 77e58350baa664c832aca01d963a0ecc76e7585f (diff) | |
| parent | c108b49ad5440fbf381c9a589d8a217da3efcb64 (diff) | |
Merge "Fix NPE in InCallUI" into lmp-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index eb4640312..5ba67ff94 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -210,9 +210,11 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> 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); + } } } |