commit 85ea9fcdc9e268e3428fcc7c79811851bd48a326
author Tyler Gunn <tgunn@google.com> Fri Jun 02 19:54:56 2017 +0000
committer Tyler Gunn <tgunn@google.com> Fri Jun 02 22:13:31 2017 +0000
tree 03fd4c453644c993d88edf9aa2f34e2bfd7ef5b8
parent 4f72d25e99976bfc6a59fcde392ff79d074971c3

Fix NullPointerException in supp service notify handler.

Test: Manual
Bug: 62202366
Merged-In: I4804a7dec41d355dae706d4fe4613d40790cba7f
Change-Id: I4804a7dec41d355dae706d4fe4613d40790cba7f
(cherry picked from commit c3707ca5a4893304f437be21ec64edc3aeb6488b)

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 34bc70b..66a858a 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -151,7 +151,8 @@
                     break;
                 case MSG_SUPP_SERVICE_NOTIFY:
                     Log.v(TelephonyConnection.this, "MSG_SUPP_SERVICE_NOTIFY on phoneId : "
-                            +getPhone().getPhoneId());
+                            + getPhone() != null ? Integer.toString(getPhone().getPhoneId())
+                            : "null");
                     SuppServiceNotification mSsNotification = null;
                     if (msg.obj != null && ((AsyncResult) msg.obj).result != null) {
                         mSsNotification =