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

Commit b2c73307 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - Imsi"

parents 244ba47f e364af94

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -11606,7 +11606,6 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

    method public int getMaxNumberOfSimultaneouslyActiveSims();

    method public static long getMaxNumberVerificationTimeoutMillis();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getMergedImsisFromGroup();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask();

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

    method public int getSimApplicationState();

telephony/java/android/telephony/TelephonyManager.java

+0 −1
Original line number Diff line number Diff line
@@ -4511,7 +4511,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public @NonNull String[] getMergedImsisFromGroup() {

        try {