| commit | bc71ee5ecebfdaad91c234e3f9cd14cb6898a9ad | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Sat Nov 19 22:28:47 2022 -0800 |
| committer | Jack Yu <jackyu@google.com> | Fri Mar 03 19:40:50 2023 -0800 |
| tree | bd226b358d7bea67049aade5ca9c648af6acd8cb | |
| parent | 839c6e88b4d0db24b4f09228f3f20575e7bd8c19 [diff] |
Add getSubscriptionId API The old getSubId or getSubscriptionIds return multiple sub ids per slot index, which is not possible in today's implementation because the slot index here refers to the logical slot index, which is also known as phone id, or the logical modem index. In today's telephony, one logical phone can only have one subscription at one time, so does the modem. Bug: 239607619 Test: Manual Merged-In: I0a43d33daf523e6f0bea054c8965281bafbbcaa4 Change-Id: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
diff --git a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java index d483dd1..a1035dc 100644 --- a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java +++ b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
@@ -57,10 +57,6 @@ } private int getSubId(int slotIndex) { - int[] subId = SubscriptionManager.getSubId(slotIndex); - if (subId != null && subId.length > 0) { - return subId[0]; - } - return SubscriptionManager.INVALID_SUBSCRIPTION_ID; + return SubscriptionManager.getSubscriptionId(slotIndex); } }