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

Commit ebda82cb authored by Aman Gupta's avatar Aman Gupta Committed by Automerger Merge Worker
Browse files

Merge "Adding maxTargetSdk AndroidS to DATA_ROAMING. This will make sure that... 

Merge "Adding maxTargetSdk AndroidS 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: c1f65088

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



Change-Id: Ic79f00b6d9b582e90549318583c87574af3728cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c36979d c1f65088

core/java/android/provider/Settings.java

+3 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import android.os.ResultReceiver; 
import android.os.ServiceManager;

import android.os.UserHandle;

import android.speech.tts.TextToSpeech;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.AndroidException;

import android.util.ArrayMap;
@@ -11309,8 +11310,9 @@ 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













        @Readable(maxTargetSdk = Build.VERSION_CODES.S)















        public static final String DATA_ROAMING = "data_roaming";





























        /**