| commit | 5e84729b10ff59617a5d992ae35672b760bc1f08 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Mar 04 19:10:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Mar 04 19:10:17 2023 +0000 |
| tree | 74192684f4adeb736e616fe40132f833a241b41a | |
| parent | ea2310e0feeeb4bb13bad90f1670fe0909ded8f1 [diff] | |
| parent | 7813c4a9a386f2f45ae1080b0d80455047cd16a2 [diff] |
Merge "Add getSubscriptionId API" am: 7813c4a9a3 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383 Change-Id: I8d3584c77241e2d273bccf1d97ad592501d9afd5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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); } }