From 5e6162de625dfda047ff390bbc1ccf9a97db2261 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Mon, 22 Sep 2014 20:47:45 -0700
Subject: [PATCH] Fix NPE crash when mPhone is null

Bug:17609710
Change-Id: Idb99feb6f15fd29809adde51cda1eb0d44e20101
---
 telecomm/java/android/telecom/InCallService.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java
index fa12756cc52b8..11da0f20dbb30 100644
--- a/telecomm/java/android/telecom/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -59,6 +59,10 @@ public abstract class InCallService extends Service {
     private final Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
+            if (mPhone == null && msg.what != MSG_SET_IN_CALL_ADAPTER) {
+                return;
+            }
+
             switch (msg.what) {
                 case MSG_SET_IN_CALL_ADAPTER:
                     mPhone = new Phone(new InCallAdapter((IInCallAdapter) msg.obj));