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

Commit 300a0262 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge "Have isValidPhoneId and isValidSlotIndex based on activeModemCount."

parents c5883222 a43e23fb

telephony/java/android/telephony/SubscriptionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2101,13 +2101,13 @@ public class SubscriptionManager { 
    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public static boolean isValidSlotIndex(int slotIndex) {

        return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getSupportedModemCount();

        return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getActiveModemCount();

    }



    /** @hide */

    @UnsupportedAppUsage

    public static boolean isValidPhoneId(int phoneId) {

        return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getSupportedModemCount();

        return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getActiveModemCount();

    }



    /** @hide */