diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-26 23:26:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-26 23:26:17 +0000 |
| commit | 710401a657e742bfaf447c2fbeb366944b7f2fe7 (patch) | |
| tree | 29c02c3a10180615a6ff29fdff0907514abd9d46 | |
| parent | 91ae0d0d8d053822014f43a821d940fc169cb72f (diff) | |
| parent | 31952450ba6804f3917eb4cc6eee28b2a3ebf641 (diff) | |
Merge "Hide setPolicyDataEnabled" into rvc-dev
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b6304416ba38..0015f4fe1e97 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11812,7 +11812,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(@NonNull String, int, boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPolicyDataEnabled(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRadioEnabled(boolean); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a51f70d01f86..31d965463a7e 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -11071,7 +11071,6 @@ public class TelephonyManager { * @param enabled True if enabling the data, otherwise disabling. * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setPolicyDataEnabled(boolean enabled) { try { |