Add support for max-target-s am: 2ea954fdf7 am: 41e6dd090fandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release

Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/18164346

Change-Id: I4a15301cc7250b1d91a723942f1c6c5b2bbcaac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/java/com/android/class2nonsdklist/Class2NonSdkList.java b/java/com/android/class2nonsdklist/Class2NonSdkList.java
index 1ee6007..e5ef5f4 100644
--- a/java/com/android/class2nonsdklist/Class2NonSdkList.java
+++ b/java/com/android/class2nonsdklist/Class2NonSdkList.java
@@ -60,6 +60,7 @@ public class Class2NonSdkList {
     private static final String FLAG_MAX_TARGET_P = "max-target-p";
     private static final String FLAG_MAX_TARGET_Q = "max-target-q";
     private static final String FLAG_MAX_TARGET_R = "max-target-r";
+    private static final String FLAG_MAX_TARGET_S = "max-target-s";
 
     private static final String FLAG_PUBLIC_API = "public-api";
 
@@ -72,8 +73,8 @@ public class Class2NonSdkList {
         map.put(28, FLAG_MAX_TARGET_P);
         map.put(29, FLAG_MAX_TARGET_Q);
         map.put(30, FLAG_MAX_TARGET_R);
-        map.put(31, FLAG_UNSUPPORTED); // TODO(b/169748350) add support for FLAG_MAX_TARGET_S
-        map.put(32, FLAG_UNSUPPORTED); // same for S_V2 and T
+        map.put(31, FLAG_MAX_TARGET_S);
+        map.put(32, FLAG_UNSUPPORTED);
         map.put(33, FLAG_UNSUPPORTED);
         map.put(10000, FLAG_UNSUPPORTED); // VMRuntime.SDK_VERSION_CUR_DEVELOPMENT
         TARGET_SDK_TO_LIST_MAP = Collections.unmodifiableMap(map);