summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chen Xu <fionaxu@google.com> 2022-06-02 18:44:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-02 18:44:14 +0000
commita0da35749a5ff5e36459cea5021f7409d39eb1e0 (patch)
tree58261d84ab4ba851a728be599bfab5be76278554
parent1c9eb9fcfc95b2ebea399087b3e162d934e631c8 (diff)
parent95706219863e92b883831f3a4c6248805c229653 (diff)
Merge "Adding maxTargetSdk AndroidS_V2 to DATA_ROAMING. This will make sure that beyond S people can not access the DATA_ROAMING API from Settingss.Ideal way to use this is from TelephonyManager." into tm-dev am: 567d57f206 am: 9570621986
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692749 Change-Id: I525c8730501ef9569a3bad091787d10ef0eed5b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/provider/Settings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index eca36a16fcba..7964f7cd6908 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -11442,7 +11442,7 @@ public final class Settings {
* Whether or not data roaming is enabled. (0 = false, 1 = true)
* Use {@link TelephonyManager#isDataRoamingEnabled} instead of calling via settings.
*/
- @Readable(maxTargetSdk = Build.VERSION_CODES.S)
+ @Readable(maxTargetSdk = Build.VERSION_CODES.S_V2)
public static final String DATA_ROAMING = "data_roaming";
/**