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

Commit 5a7b24f6 authored by Greg Kaiser's avatar Greg Kaiser Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix permission on TM#isDataEnabled"" am: 469e5b33 am: 3033b151 am: 9ad1f656 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a1a974bd0456efbf92a1be1fbc5ace38499e636
parents cc548828 9ad1f656

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -42373,7 +42373,7 @@ package android.telephony { 
    method @Deprecated public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);

    method @Deprecated public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);

    method public boolean isConcurrentVoiceAndDataSupported();

    method public boolean isConcurrentVoiceAndDataSupported();

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

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

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean isDataEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabledForReason(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabledForReason(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();

    method public boolean isEmergencyNumber(@NonNull String);

    method public boolean isEmergencyNumber(@NonNull String);

telephony/java/android/telephony/TelephonyManager.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -9401,10 +9401,9 @@ public class TelephonyManager { 
     * @return true if mobile data is enabled.

     * @return true if mobile data is enabled.

     */

     */

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

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

            android.Manifest.permission.MODIFY_PHONE_STATE,

            android.Manifest.permission.MODIFY_PHONE_STATE})

            android.Manifest.permission.READ_PHONE_STATE})

    public boolean isDataEnabled() {

    public boolean isDataEnabled() {

        return isDataEnabledForReason(DATA_ENABLED_REASON_USER);

        return getDataEnabled(getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));

    }

    }

















    /**







    /**










@@ -9649,7 +9648,7 @@ public class TelephonyManager {









    @SystemApi







    @SystemApi











    public boolean getDataEnabled(int subId) {







    public boolean getDataEnabled(int subId) {











        try {







        try {











            return isDataEnabledForReason(subId, DATA_ENABLED_REASON_USER);







            return isDataEnabledForReason(DATA_ENABLED_REASON_USER);











        } catch (RuntimeException e) {







        } catch (RuntimeException e) {











            Log.e(TAG, "Error calling isDataEnabledForReason e:" + e);







            Log.e(TAG, "Error calling isDataEnabledForReason e:" + e);











        }







        }