commit d3579f0c711f4cc1729becc63a9004f553ab47e8
author Tyler Gunn <tgunn@google.com> Tue Jun 05 20:31:58 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 05 20:31:58 2018 +0000
tree 47ea6d77a33f427e2a8a38db25be9805fc33b37b
parent 629232b794272a484e94b3ba0991fcad7a420b74
parent 84101e8a0f89a97f79919debe181223384c97ba6

Merge "DO NOT MERGE Revise security requirements for TelephonyManager#endCall." into oc-dev

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