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

Commit adbd0777 authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" am: 2b79ba7f... 

Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" am: 2b79ba7f am: 47e1305b am: 66a873b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23928895de3898903191b0341947ab6de9a7c75a
parents 46043a61 66a873b5

core/api/current.txt

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

    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.MODIFY_PHONE_STATE}) public boolean isDataEnabled();

    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.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 public boolean isEmergencyNumber(@NonNull String);

telephony/java/android/telephony/TelephonyManager.java

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

     */

    @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() {

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

        try {

            return isDataEnabledForReason(DATA_ENABLED_REASON_USER);

        } catch (IllegalStateException ise) {

            // TODO(b/176163590): Remove this catch once TelephonyManager is booting safely.

            Log.e(TAG, "Error calling #isDataEnabled, returning default (false).", ise);

            return false;

        }

    }















    /**










@@ -10058,7 +10065,7 @@ public class TelephonyManager {













    @SystemApi















    public boolean getDataEnabled(int subId) {















        try {













            return isDataEnabledForReason(DATA_ENABLED_REASON_USER);













            return isDataEnabledForReason(subId, DATA_ENABLED_REASON_USER);















        } catch (RuntimeException e) {















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















        }