commit 2fbab892e9f3aed40849228a0ada67c2fbfd529b
author Jay Shrauner <shrauner@google.com> Tue Sep 23 20:59:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 23 20:59:15 2014 +0000
tree 376a0c965c9aaa26f2084aa48d60d54e745e2e5d
parent d0e0154c1f0be7786f12aea60add7ed4fb7c4e6c
parent 5e6162de625dfda047ff390bbc1ccf9a97db2261

Merge "Fix NPE crash when mPhone is null" into lmp-dev

telecomm/java/android/telecom/InCallService.java

diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java
index fa12756..11da0f2 100644
--- a/telecomm/java/android/telecom/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -59,6 +59,10 @@
     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));