commit a8e92aba3664dd02303f34fc6fefcefe537cae36
author Sandeep Kunta <skunta@qti.qualcomm.com> Sat Apr 02 00:03:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Apr 02 00:03:28 2016 +0000
tree 2c453f0e38b08d0c9331a63e9f6775652e06a680
parent 92390600d20bc5ee3f74e262fadda287c9c818f6
parent 2cde1d71498e5164cdbc5ffff41465e0bc3259e2

Merge "com.android.Phone crash popup during Phone app crash" into nyc-dev am: 0e2238b
am: 2cde1d7

* commit '2cde1d71498e5164cdbc5ffff41465e0bc3259e2':
  com.android.Phone crash popup during Phone app crash

Change-Id: I362bef95d2f4e686e55ace644e43c1c7dd54b1ee

src/com/android/phone/EmergencyCallbackModeService.java

diff --git a/src/com/android/phone/EmergencyCallbackModeService.java b/src/com/android/phone/EmergencyCallbackModeService.java
index 997be83..f06ae0c 100644
--- a/src/com/android/phone/EmergencyCallbackModeService.java
+++ b/src/com/android/phone/EmergencyCallbackModeService.java
@@ -98,14 +98,16 @@
 
     @Override
     public void onDestroy() {
-        // Unregister receiver
-        unregisterReceiver(mEcmReceiver);
-        // Unregister ECM timer reset notification
-        mPhone.unregisterForEcmTimerReset(mHandler);
+        if (mPhone != null) {
+            // Unregister receiver
+            unregisterReceiver(mEcmReceiver);
+            // Unregister ECM timer reset notification
+            mPhone.unregisterForEcmTimerReset(mHandler);
 
-        // Cancel the notification and timer
-        mNotificationManager.cancel(R.string.phone_in_ecm_notification_title);
-        mTimer.cancel();
+            // Cancel the notification and timer
+            mNotificationManager.cancel(R.string.phone_in_ecm_notification_title);
+            mTimer.cancel();
+        }
     }
 
     /**