Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e84729b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add getSubscriptionId API" am: 7813c4a9 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383



Change-Id: I8d3584c77241e2d273bccf1d97ad592501d9afd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea2310e0 7813c4a9

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

+1 −5
Original line number Diff line number Diff line
@@ -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);

    }

}