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

Commit dfaf434b authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Make sure to handle exceptions for setDataEnabled 

Make sure to handle exceptions for setDataEnabledWithReason
and isDataEnabledWithReason when they are called within
existing APIs

Bug: 155765311
Test: build
Change-Id: If59deaca05b841c8c896c449445434b4181c9626
Merged-In: If59deaca05b841c8c896c449445434b4181c9626
parent 70c1d668

telephony/java/android/telephony/TelephonyManager.java

+21 −4
Original line number Diff line number Diff line
@@ -9178,7 +9178,11 @@ public class TelephonyManager { 
    @Deprecated

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void setDataEnabled(int subId, boolean enable) {

        try {

            setDataEnabledWithReason(subId, DATA_ENABLED_REASON_USER, enable);

        } catch (RuntimeException e) {

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

        }

    }















    /**










@@ -9385,7 +9389,12 @@ public class TelephonyManager {













    @Deprecated















    @SystemApi















    public boolean getDataEnabled(int subId) {













        try {















            return isDataEnabledWithReason(DATA_ENABLED_REASON_USER);













        } catch (RuntimeException e) {













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













        }













        return false;















    }





























    /**










@@ -10951,7 +10960,11 @@ public class TelephonyManager {













    @SystemApi















    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)















    public void setCarrierDataEnabled(boolean enabled) {













        try {















            setDataEnabledWithReason(DATA_ENABLED_REASON_CARRIER, enabled);













        } catch (RuntimeException e) {













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













        }















    }





























    /**










@@ -11043,7 +11056,11 @@ public class TelephonyManager {













    @Deprecated















    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)















    public void setPolicyDataEnabled(boolean enabled) {













        try {















            setDataEnabledWithReason(DATA_ENABLED_REASON_POLICY, enabled);













        } catch (RuntimeException e) {













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













        }















    }





























    /** @hide */