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

Commit b2e00638 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "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"
parents becfacd9 ebda82cb

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";





























        /**