commit 4916261479660e136279c4cc8330c479bdadf56f
author Tyler Gunn <tgunn@google.com> Fri Jun 02 19:48:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 02 19:48:25 2017 +0000
tree e3df6b59935da1f8d570be19e1823d0de717d2a5
parent 5de060545320b49e31ad39caf3f27a7dc34642e3
parent 9a7fa0550b3f314af5be209ffea363c03d6451cd

Merge "Fix NullPointerException in supp service notify handler."
am: 9a7fa0550b

Change-Id: I736f7e85ec2feeb50e3441ffce3a8e1dc08795c8

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 41628e6..a403d1f 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -152,7 +152,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 =