From 619b3c0d09ff01ca163601a22973a58fd13ca64c Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Tue, 2 Sep 2014 17:13:45 -0700
Subject: [PATCH] Fix NPE in onDestroy.

NPE can happen when calls are canceled immediately before incallservice
has a chance to respond.

Bug:17362107
Change-Id: I6bf318f5f7d89731b686a1523678a26764fa9bf3
---
 telecomm/java/android/telecomm/InCallService.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/telecomm/java/android/telecomm/InCallService.java b/telecomm/java/android/telecomm/InCallService.java
index cbcee752098c5..62a90bc551688 100644
--- 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;
     }