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

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

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

parents 967a648e 54317698

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47605,7 +47605,7 @@ package android.telephony { 
    method public boolean isEmergencyNumber(@NonNull String);

    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 @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, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isModemEnabledForSlot(int);

    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);

telephony/java/android/telephony/TelephonyManager.java

+3 −0
Original line number Diff line number Diff line
@@ -16074,6 +16074,7 @@ public class TelephonyManager { 
     * Indicates whether or not there is a modem stack enabled for the given SIM slot.

     *

     * <p>Requires Permission:

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

     * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE},

     * READ_PRIVILEGED_PHONE_STATE or that the calling app has carrier privileges (see

     * {@link #hasCarrierPrivileges()}).
@@ -16083,8 +16084,10 @@ public class TelephonyManager { 
     * @throws UnsupportedOperationException If the device does not have

     *          {@link PackageManager#FEATURE_TELEPHONY}.

     */

    @FlaggedApi(Flags.FLAG_MACRO_BASED_OPPORTUNISTIC_NETWORKS)

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

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

            android.Manifest.permission.READ_BASIC_PHONE_STATE,

            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE})

    @RequiresFeature(PackageManager.FEATURE_TELEPHONY)

    public boolean isModemEnabledForSlot(int slotIndex) {