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

Commit 2c63fa7a authored by Rambo Wang's avatar Rambo Wang Committed by Android (Google) Code Review
Browse files

Merge "Relax TM.isMultiSimSupported with READ_BASIC_PHONE_STATE permission" into main

parents c629071f 8d32ac18

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47606,7 +47606,7 @@ package android.telephony { 
    method public boolean isHearingAidCompatibilitySupported();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isModemEnabledForSlot(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int isMultiSimSupported();

    method @FlaggedApi("com.android.internal.telephony.flags.macro_based_opportunistic_networks") @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public int isMultiSimSupported();

    method public boolean isNetworkRoaming();

    method @RequiresPermission(android.Manifest.permission.READ_BASIC_PHONE_STATE) public boolean isPremiumCapabilityAvailableForPurchase(int);

    method public boolean isRadioInterfaceCapabilitySupported(@NonNull String);

telephony/java/android/telephony/TelephonyManager.java

+5 −2
Original line number Diff line number Diff line
@@ -16199,7 +16199,8 @@ public class TelephonyManager { 
     * Returns if the usage of multiple SIM cards at the same time to register on the network

     * (e.g. Dual Standby or Dual Active) is supported by the device and by the carrier.

     *

     * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     * <p>Requires Permission:{@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE},

     * {@link android.Manifest.permission#READ_BASIC_PHONE_STATE READ_BASIC_PHONE_STATE}

     * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).

     *

     * @return {@link #MULTISIM_ALLOWED} if the device supports multiple SIMs.
@@ -16210,8 +16211,10 @@ public class TelephonyManager { 
     * @throws UnsupportedOperationException If the device does not have

     *          {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}.

     */

    @FlaggedApi(Flags.FLAG_MACRO_BASED_OPPORTUNISTIC_NETWORKS)

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @RequiresPermission(anyOf = {android.Manifest.permission.READ_PHONE_STATE,

            Manifest.permission.READ_BASIC_PHONE_STATE})

    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)

    @IsMultiSimSupportedResult

    public int isMultiSimSupported() {