Fix NPE crash when mPhone is null

Bug:17609710 Change-Id: Idb99feb6f15fd29809adde51cda1eb0d44e20101
2014-09-22 20:47:45 -07:00
parent acc0d6de53
commit 5e6162de62
1 changed files with 4 additions and 0 deletions
--- 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));