commit 6057aa4341f247a55b89fb841b3ee1e659604edf
author Pengquan Meng <mpq@google.com> Tue Jan 29 11:26:51 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 29 11:26:51 2019 -0800
tree e9e5b9afe679863ad3efdac6d3ab22a72f4148f6
parent 8ab79b716d6b672817d19bb6578cc1422dc45705
parent cbd4680c1f58b9b8732e6465abbf461d6cd766b7

Merge "fix null pointer exception" am: 09fe4c0241
am: cbd4680c1f

Change-Id: Icf5f99f9b252406cb0fd0c041c2db3c8e9a2710a

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ca40de1..c2d112e 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 {