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

Commit a4c95294 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the usage of SubscriptionManger.getSubId" into udc-dev

parents 3fc95a40 3e2a3476

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −1
Original line number Diff line number Diff line
@@ -2631,7 +2631,6 @@ public class SubscriptionController extends ISub.Stub { 
     * @deprecated

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @Override

    @Deprecated

    public int[] getSubIds(int slotIndex) {

        if (VDBG) printStackTrace("[getSubId]+ slotIndex=" + slotIndex);

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+0 −5
Original line number Diff line number Diff line
@@ -2632,11 +2632,6 @@ public class SubscriptionManagerService extends ISub.Stub { 
                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

    }



    @Override

    public int[] getSubIds(int slotIndex) {

        return new int[]{getSubId(slotIndex)};

    }



    /**

     * Update default sub id.

     */