Merge "Fix NPE in onDestroy." into lmp-dev

2014-09-03 14:48:36 +00:00
parent 6e31e0f3d1 619b3c0d09
commit 7632a807f7
1 changed files with 6 additions and 4 deletions
--- a/telecomm/java/android/telecomm/InCallService.java
+++ b/telecomm/java/android/telecomm/InCallService.java
@@ -165,11 +165,13 @@ public abstract class InCallService extends Service {

    @Override
    public boolean onUnbind(Intent intent) {
-        Phone oldPhone = mPhone;
-        mPhone = null;
+        if (mPhone != null) {
+            Phone oldPhone = mPhone;
+            mPhone = null;

-        oldPhone.destroy();
-        onPhoneDestroyed(oldPhone);
+            oldPhone.destroy();
+            onPhoneDestroyed(oldPhone);
+        }
        return false;
    }