commit a75004d9865ab1a8d8707b659d11baf88901314e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 07 01:10:48 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 07 01:10:48 2022 +0000
tree 002ee7903afcd53fa53b028956f737ce538ec11d
parent b187dd0a4043225f8e1f46ff44eb65af76e12802
parent 2ea954fdf751b7251e104f3d3f3e7a3a2ef2e675

Snap for 8554681 from 2ea954fdf751b7251e104f3d3f3e7a3a2ef2e675 to tm-release

Change-Id: Iffcac5f2207efac91c9b78fe170ecc4a11af7af6

java/com/android/class2nonsdklist/Class2NonSdkList.java

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