Add support for max-target-s am: 2ea954fdf7 am: 41e6dd090f

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>
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 @@
     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 @@
         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);