Merge "Add getSubscriptionId API" am: 7813c4a9a3
am: 5e84729b10
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383 Change-Id: I4229a085aa2f088bbff7c6335d59b76c32a66283 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -57,10 +57,6 @@ public class DisableSmartForwardingTask implements Runnable {
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user