commit cbd4680c1f58b9b8732e6465abbf461d6cd766b7
author Pengquan Meng <mpq@google.com> Tue Jan 29 11:20:46 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 29 11:20:46 2019 -0800
tree 43f41c85d39ad1977993acfa09bb37208df17158
parent 3f750c2bbe16cf758202ae707b37182633cc898e
parent 09fe4c0241abd4d3a19fc1e1423a136fcacbeda0

Merge "fix null pointer exception"
am: 09fe4c0241

Change-Id: I69e5ef278c87a243d6074f4718f0b0761e5c92a0

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 36a7b99..80fe71a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5122,6 +5122,7 @@
         final Phone phone = getPhone(subId);
         if (phone == null) {
             log("getSimLocaleForSubscriber, invalid subId");
+            return null;
         }
         final long identity = Binder.clearCallingIdentity();
         try {