am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev

* commit '6b70083ac1ec46451ab4b1902c4246a8063831d8': Fix NPE crash when mPhone is null
2014-09-23 21:15:23 +00:00
parent 588016f72e 368ad52604
commit 5b0ec499fb
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));