Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to handle exceptions for setDataEnabled

Browse Source 
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
This commit is contained in:
Sooraj Sasindran
2020-05-05 10:53:57 -07:00
parent 70c1d66847
commit dfaf434b20
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -9178,7 +9178,11 @@ public class TelephonyManager {
@Deprecated @Deprecated
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setDataEnabled(int subId, boolean enable) { public void setDataEnabled(int subId, boolean enable) {
setDataEnabledWithReason(subId, DATA_ENABLED_REASON_USER, 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 @Deprecated
@SystemApi @SystemApi
public boolean getDataEnabled(int subId) { public boolean getDataEnabled(int subId) {
return isDataEnabledWithReason(DATA_ENABLED_REASON_USER); 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 @SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setCarrierDataEnabled(boolean enabled) { public void setCarrierDataEnabled(boolean enabled) {
setDataEnabledWithReason(DATA_ENABLED_REASON_CARRIER, 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 @Deprecated
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setPolicyDataEnabled(boolean enabled) { public void setPolicyDataEnabled(boolean enabled) {
setDataEnabledWithReason(DATA_ENABLED_REASON_POLICY, enabled); try {
setDataEnabledWithReason(DATA_ENABLED_REASON_POLICY, enabled);
} catch (RuntimeException e) {
Log.e(TAG, "Error calling setDataEnabledWithReason e:" + e);
}
} }
/** @hide */ /** @hide */