commit 7813c4a9a386f2f45ae1080b0d80455047cd16a2
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 04 18:38:35 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 04 18:38:35 2023 +0000
tree bd226b358d7bea67049aade5ca9c648af6acd8cb
parent 839c6e88b4d0db24b4f09228f3f20575e7bd8c19
parent bc71ee5ecebfdaad91c234e3f9cd14cb6898a9ad

Merge "Add getSubscriptionId API"

src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java

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);
     }
 }