commit f8691aee4800045f5ceaad7d5ad54ab72bd7e897
author Tyler Gunn <tgunn@google.com> Tue Jun 05 10:06:03 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 05 10:06:03 2018 -0700
tree c1782c490388d7dc376fe30371e36c11b6c62e24
parent 96671ef54437f415981526dce08ca51e268fc7b5
parent 37e1a3928bf28a48baa05e34250b1e5665f68277

Merge "Fix potential NPE in EmergencyCallbackModeExitDialog." into oc-dev am: 629232b794
am: 37e1a3928b

Change-Id: I0697460e3bee85cc86845e5d02e905c594a0c102

src/com/android/phone/EmergencyCallbackModeExitDialog.java

diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
index f5509b9..07d518f 100644
--- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java
+++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
@@ -80,9 +80,11 @@
 
         mPhone = PhoneGlobals.getInstance().getPhoneInEcm();
         // Check if phone is in Emergency Callback Mode. If not, exit.
-        final boolean isInEcm = mPhone.isInEcm();
-        Log.i(TAG, "ECMModeExitDialog launched - isInEcm: " + isInEcm + " phone:" + mPhone);
-        if (mPhone == null || !isInEcm) {
+        if (mPhone == null || !mPhone.isInEcm()) {
+            if (mPhone == null) {
+              android.util.EventLog.writeEvent(0x534e4554, "79995313", -1, "");
+            }
+            Log.i(TAG, "ECMModeExitDialog launched - isInEcm: false" + " phone:" + mPhone);
             finish();
             return;
         }