From d6daec7f590250e1c49e7e7c091f8249e64a2e6a Mon Sep 17 00:00:00 2001
From: Aman Gupta <amagup@google.com>
Date: Wed, 23 Mar 2022 04:29:21 +0000
Subject: [PATCH] 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.

Test: Added CTS Test.
Bug: 172467621
Change-Id: I05cb675231b69f40896007601627e8078e0ecb02
---
 core/java/android/provider/Settings.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a6ad5e5863df6..ca4fc1edad6c7 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -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;
@@ -11303,8 +11304,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";
 
         /**