commit a9f0885b7f1e422335e91c776e15e7ae9b2b3ffd
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 03 00:21:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 03 00:21:31 2017 +0000
tree d291c16bae01955b42c6df9135fdd58a84c92e0c
parent 7db4e3d23c84cbb7a39e63079fef22ba878e5711
parent 85ea9fcdc9e268e3428fcc7c79811851bd48a326

Merge "Fix NullPointerException in supp service notify handler." into oc-dev

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 =