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

Commit 17fd16a8 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added read phone state permission for getNetworkCountryIso" 

am: 84096797

Change-Id: I879557e7f0e868cfc30a74a92acbebba42a5ff60
parents 2b56e7f5 84096797

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8884,7 +8884,7 @@ 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 public String getNetworkCountryIso(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getNetworkCountryIso(int);

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

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3041,7 +3041,7 @@ package android.telephony { 
    method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);

    method public int getEmergencyNumberDbVersion();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();

    method @NonNull public String getNetworkCountryIso(int);

    method @NonNull @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getNetworkCountryIso(int);

    method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();

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

    method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

telephony/java/android/telephony/TelephonyManager.java

+10 −2
Original line number Diff line number Diff line
@@ -2373,7 +2373,14 @@ public class TelephonyManager { 
     * @return the lowercase 2 character ISO-3166 country code, or empty string if not available.

     */

    public String getNetworkCountryIso() {

        return getNetworkCountryIso(getPhoneId());

        try {

            ITelephony telephony = getITelephony();

            if (telephony == null) return "";

            return telephony.getNetworkCountryIsoForPhone(getPhoneId(),

                    null /* no permission check */);

        } catch (RemoteException ex) {

            return "";

        }

    }



    /**
@@ -2401,6 +2408,7 @@ public class TelephonyManager { 
    @SystemApi

    @TestApi

    @NonNull

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public String getNetworkCountryIso(int slotIndex) {

        try {

            if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {
@@ -2409,7 +2417,7 @@ public class TelephonyManager { 


            ITelephony telephony = getITelephony();

            if (telephony == null) return "";

            return telephony.getNetworkCountryIsoForPhone(slotIndex);

            return telephony.getNetworkCountryIsoForPhone(slotIndex, getOpPackageName());

        } catch (RemoteException ex) {

            return "";

        }

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ interface ITelephony { 
     * operator's MCC (Mobile Country Code).

     * @see android.telephony.TelephonyManager#getNetworkCountryIso

     */

    String getNetworkCountryIsoForPhone(int phoneId);

    String getNetworkCountryIsoForPhone(int phoneId, String callingPkg);



    /**

     * Returns the neighboring cell information of the device.