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

Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev

Browse Source
This commit is contained in:
Hall Liu
2021-02-03 19:54:14 +00:00
committed by Android (Google) Code Review
parent 40517bbf46 7da0b797ed
commit 4edcb5272a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -11807,7 +11807,7 @@ package android.telephony {
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult setIccLockEnabled(boolean, @NonNull String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabled(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);
method public int setNrDualConnectivityState(int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);

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

@@ -14242,7 +14242,7 @@ public class TelephonyManager {
* If this policy is enabled, data will be temporarily enabled on the non-default data SIM
* during any voice calls.
*
* This policy can be enabled and disabled via {@link #setMobileDataPolicyEnabledStatus}.
* This policy can be enabled and disabled via {@link #setMobileDataPolicyEnabled}.
* @hide
*/
@SystemApi
@@ -14256,7 +14256,7 @@ public class TelephonyManager {
* will also return true for {@link ApnSetting#TYPE_MMS}.
* When disabled, the MMS APN will be governed by the same rules as all other APNs.
*
* This policy can be enabled and disabled via {@link #setMobileDataPolicyEnabledStatus}.
* This policy can be enabled and disabled via {@link #setMobileDataPolicyEnabled}.
* @hide
*/
@SystemApi
@@ -14284,11 +14284,11 @@ public class TelephonyManager {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setMobileDataPolicyEnabledStatus(@MobileDataPolicy int policy, boolean enabled) {
public void setMobileDataPolicyEnabled(@MobileDataPolicy int policy, boolean enabled) {
try {
ITelephony service = getITelephony();
if (service != null) {
service.setMobileDataPolicyEnabledStatus(getSubId(), policy, enabled);
service.setMobileDataPolicyEnabled(getSubId(), policy, enabled);
}
} catch (RemoteException ex) {
// This could happen if binder process crashes.

2
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -2172,7 +2172,7 @@ interface ITelephony {
*/
String getMmsUAProfUrl(int subId);
void setMobileDataPolicyEnabledStatus(int subscriptionId, int policy, boolean enabled);
void setMobileDataPolicyEnabled(int subscriptionId, int policy, boolean enabled);
boolean isMobileDataPolicyEnabled(int subscriptionId, int policy);