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

Commit 281e4ef4 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am:... 

Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96 am: fd5d074f
am: 914861c2

Change-Id: Ibcdf9922d0be31508f22cee3fc6e5b76d26f1df7
parents a99f27b4 914861c2

telephony/java/android/telephony/SubscriptionManager.java

+0 −13
Original line number Diff line number Diff line
@@ -2104,19 +2104,6 @@ public class SubscriptionManager { 
        return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getMaxPhoneCount();

    }



    /**

     * When getPhoneCount and getMaxPhoneCount return different value, isValidPhoneId being true

     * doesn't mean the phoneId has a corresponding active slot / logical modem. If a DSDS capable

     * device is in single SIM mode, phoneId=1 is valid but not active.

     *

     * TODO: b/139642279 combine with SubscriptionManager#isValidPhoneId when phone objects

     * are dynamically allocated instead of always based on getMaxPhoneCount.

     * @hide

     */

    public static boolean isActivePhoneId(int slotIndex) {

        return slotIndex < TelephonyManager.getDefault().getPhoneCount();

    }



    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)

    public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) {