commit 842461a4b894f6306f1b8cbe88f3d950886fb627
author Michele Berionne <mberionne@google.com> Tue Dec 11 18:47:49 2018 -0800
committer Michele Berionne <mberionne@google.com> Tue Jan 08 18:37:17 2019 +0000
tree aad432fc21cfda853fd07d53774861f4eccb6bf2
parent 7bb552c49e68a6d0809011ab9e11a5d20a8889ca

Fix null pointer exception

Fix null pointer exception when SubscriptionManager.getSubId() returns
null to verify the result before accessing the first item.

Bug: 120649066
Test: Verified compilation and tested on device.
Change-Id: I4d36837ac58fdb7beb7eeaef0c2f967c3c4676bd
Merged-In: I5ed2dc7f0da3611f502d602d15b3b3d1a7ccddcb

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 393168b..21d1502 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3971,7 +3971,8 @@
             throw new NullPointerException("carriers cannot be null");
         }
 
-        int subId = SubscriptionManager.getSubId(slotIndex)[0];
+        int[] subIds = SubscriptionManager.getSubId(slotIndex);
+        int subId = (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID);
         int[] retVal = (int[]) sendRequest(CMD_SET_ALLOWED_CARRIERS, carriers, subId);
         return retVal[0];
     }
@@ -3987,7 +3988,9 @@
     @Override
     public List<CarrierIdentifier> getAllowedCarriers(int slotIndex) {
         enforceReadPrivilegedPermission();
-        int subId = SubscriptionManager.getSubId(slotIndex)[0];
+
+        int[] subIds = SubscriptionManager.getSubId(slotIndex);
+        int subId = (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID);
         return (List<CarrierIdentifier>) sendRequest(CMD_GET_ALLOWED_CARRIERS, null, subId);
     }