commit 1e53efc4c48ec80421bb0542b770332ab8efdab5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 15 06:13:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 15 06:13:48 2019 +0000
tree 4a55834a23490bd3f6eb2202c1e013c54d4dff65
parent 19d1f890a099ccee344dd5a410f235c8c5993504
parent c3ef16882d9c5f3d3f93e4b5193dd8cc62c64406

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"

src/com/android/settings/RadioInfo.java

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 099b55d..3c10b8d 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1588,14 +1588,14 @@
                 }
                 log("switching to phone " + phoneIndex);
                 // getSubId says it takes a slotIndex, but it actually takes a phone index
+                int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
                 int[] subIds = SubscriptionManager.getSubId(phoneIndex);
-                if (subIds == null || subIds.length < 1) {
-                    log("no subscription found for phoneIndex " + phoneIndex);
-                    return;
+                if (subIds != null && subIds.length > 0) {
+                    subId = subIds[0];
                 }
                 mSelectedPhoneIndex = phoneIndex;
 
-                updatePhoneIndex(phoneIndex, subIds[0]);
+                updatePhoneIndex(phoneIndex, subId);
             }
         }