commit 0e2238b6d7ed8cb14891e71642c8a29af5f9c416
author Santos Cordon <santoscordon@google.com> Fri Apr 01 23:44:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 01 23:44:41 2016 +0000
tree 2c453f0e38b08d0c9331a63e9f6775652e06a680
parent 8cec2a393a7f6ade84005c7442f38e7a55fcbc77
parent 55a6ae8fbddea5c37933383530f5cf6839daaf5d

Merge "com.android.Phone crash popup during Phone app crash" into nyc-dev

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();
+        }
     }
 
     /**