commit 55a6ae8fbddea5c37933383530f5cf6839daaf5d
author Sandeep Kunta <skunta@qti.qualcomm.com> Mon Dec 14 17:49:02 2015 +0530
committer Santos Cordon <santoscordon@google.com> Fri Apr 01 16:40:23 2016 -0700
tree 45f49357e7ba301852b0cf9e42cee3d222c703c6
parent 77550fec9e488eb8a76fcb3b4b38e7bf902af5a1

com.android.Phone crash popup during Phone app crash

When phone app crashed during Emergency call, phone went to
ECBM but the phone object is null due to phone app crash.
Because the phone object is null, ECBM is stopped and the
stopself api called to stop the service which in turn calling
the OnDestroy resulting in below exception due to receiver not
being registered in onCreate.

Change-Id: Ibd755728021f49d2c494915e59bddfbf87166e23
Fix: 27105697

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