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

Commit ab23a377 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Telephony Mainline] Rename the method from isCurrentSimOperator to... 

Merge "[Telephony Mainline] Rename the method from isCurrentSimOperator to matchesCurrentSimOperator" into rvc-dev am: e78a4b26

Change-Id: I1684e8ac46ce741552effb65eefa65f938563a04
parents dee395f2 e78a4b26

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11666,7 +11666,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAnyRadioPoweredOn();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApnMetered(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);

    method public boolean isCurrentSimOperator(@NonNull String, int, @Nullable String);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataAllowedInVoiceCall();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataConnectionEnabled();

    method public boolean isDataConnectivityPossible();
@@ -11685,6 +11684,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isTetheringApnRequired();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled();

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean matchesCurrentSimOperator(@NonNull String, int, @Nullable String);

    method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);

    method public boolean needsOtaServiceProvisioning();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled();

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -12654,7 +12654,8 @@ public class TelephonyManager { 
     * {@hide}

     */

    @SystemApi

    public boolean isCurrentSimOperator(@NonNull String mccmnc, @MvnoType int mvnoType,

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean matchesCurrentSimOperator(@NonNull String mccmnc, @MvnoType int mvnoType,

            @Nullable String mvnoMatchData) {

        try {

            if (!mccmnc.equals(getSimOperator())) {