commit 7ec6e722def8108fa07ef1b9afd08cdfc9a9a6fa
author Michele Berionne <mberionne@google.com> Thu Dec 20 17:39:49 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 20 17:39:49 2018 +0000
tree 180a7f07d932366902c82ab7653122cc95ba1a5b
parent be0d85340b7b7fe80dd9b6c5d10679fd4cfc0957
parent 85121de107a58e68d1cfcc90790ea481fbe6eed6

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 2f3dd46..43ecbd7 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5250,7 +5250,8 @@
 
         final long identity = Binder.clearCallingIdentity();
         try {
-            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,
                     workSource);
             return retVal[0];
@@ -5274,7 +5275,8 @@
 
         final long identity = Binder.clearCallingIdentity();
         try {
-            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,
                     workSource);
         } finally {