commit 2bb91e442484e0fcd5afbdf5752a397e881b8f64
author chen xu <fionaxu@google.com> Thu Jan 24 14:35:54 2019 -0800
committer chen xu <fionaxu@google.com> Thu Jan 24 14:37:37 2019 -0800
tree 76ecc86f1a9c081577b255a577ebf562d7fbba87
parent 6029f8be1f9850fcc84872919de11ec896dcf9f1

fix null pointer exception

Bug: 123329829
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 9b3a4db..d10d3b5 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5123,6 +5123,7 @@
         final Phone phone = getPhone(subId);
         if (phone == null) {
             log("getSimLocaleForSubscriber, invalid subId");
+            return null;
         }
         final long identity = Binder.clearCallingIdentity();
         try {