commit ab94770df0affde7445fc08c9c9cc463c33397a5
author James Mattis <jmattis@google.com> Wed Apr 03 14:18:34 2019 -0700
committer James Mattis <jmattis@google.com> Mon Apr 08 20:23:05 2019 +0000
tree be8c81a3724690ba7c1092f37a78788c2c284f5b
parent 257375a7da3d341b827c879b9c0ab445ef9afd9f

Only going to use the defaultPhone instance if it is not null.

On boot, PhoneInterfaceManager would throw errors when it tried to use a null object on a hikey960 when it assumed there was a phone when in fact, there was not.

Merged-In: I16076b712ea53b5cbe9a2646b78ba5f515410beb
Bug: 129880602
Test: Flashed Hikey960 and no error on boot.
Change-Id: I16076b712ea53b5cbe9a2646b78ba5f515410beb
(cherry picked from commit 2d92f4903c5213a22fed6ce1dfcb9dc0b76c8ee9)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ca93961..74ac71a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -834,7 +834,9 @@
                 case CMD_GET_MODEM_ACTIVITY_INFO:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_GET_MODEM_ACTIVITY_INFO_DONE, request);
-                    defaultPhone.getModemActivityInfo(onCompleted, request.workSource);
+                    if (defaultPhone != null) {
+                        defaultPhone.getModemActivityInfo(onCompleted, request.workSource);
+                    }
                     break;
 
                 case EVENT_GET_MODEM_ACTIVITY_INFO_DONE: