commit 9c29148b7653716c12d8fdfebf95393d1fa40c7b
author Pengquan Meng <mpq@google.com> Mon Jan 28 16:26:29 2019 -0800
committer Pengquan Meng <mpq@google.com> Mon Jan 28 16:28:34 2019 -0800
tree 43f41c85d39ad1977993acfa09bb37208df17158
parent 4afc5daa73397d80061f6227e4025c7e4809569d

fix null pointer exception

Bug: 123329829
Test: build
Merged-In: I544b9599dca628cf80f36f9f2a9474ea61d6f12c
Change-Id: I544b9599dca628cf80f36f9f2a9474ea61d6f12c

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 {