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

Commit a0da3574 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "Adding maxTargetSdk AndroidS_V2 to DATA_ROAMING. This will make sure... 

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: 567d57f2 am: 95706219

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692749



Change-Id: I525c8730501ef9569a3bad091787d10ef0eed5b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c9eb9fc 95706219

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -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";















        /**