commit 09fe4c0241abd4d3a19fc1e1423a136fcacbeda0
author Pengquan Meng <mpq@google.com> Tue Jan 29 19:06:07 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 29 19:06:07 2019 +0000
tree 43f41c85d39ad1977993acfa09bb37208df17158
parent 4afc5daa73397d80061f6227e4025c7e4809569d
parent 9c29148b7653716c12d8fdfebf95393d1fa40c7b

Merge "fix null pointer exception"

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 {