Bump highest known API level to include Tiramisu

Also corrects the build code for Sv2, updates the product name
for Sv2 to be "12L", and switches the product version for the
preview release to be the codename (which required updating the
utility method).

Test: Various existing tests in tools/adt/idea updated in this
      same topic, plus some new updated ones in SdkVersionInfo
Bug: None
Change-Id: I0a427bd15c0944fb19598aee179090734770031e

2 files changed, 34 insertions, 6 deletions

diff --git a/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java b/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java
index 6098a150a1..815631d144 100644
--- a/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java
@@ -28,7 +28,7 @@ public class SdkVersionInfo {
      * updated for a new release. This number is used as a baseline and any more recent platforms
      * found can be used to increase the highest known number.
      */
-    public static final int HIGHEST_KNOWN_API = 32;
+    public static final int HIGHEST_KNOWN_API = 33;
 
     /**
      * Like {@link #HIGHEST_KNOWN_API} but does not include preview platforms.
@@ -104,6 +104,8 @@ public class SdkVersionInfo {
         String versionString = getVersionStringSanitized(api);
         if (codeName == null) {
             return versionString;
+        } else if (versionString.contains(codeName)) {
+            return String.format(Locale.US, "API %1$d: Android %2$s", api, versionString);
         } else {
             return String.format(Locale.US, "API %1$d: Android %2$s (%3$s)", api, versionString, codeName);
         }
@@ -151,8 +153,15 @@ public class SdkVersionInfo {
             case 28: return "9.0";
             case 29: return "10.0";
             case 30: return "11.0";
-            case 31:
-                return "12.0";
+            case 31: return "12.0";
+            case 32: return "12L";
+            case 33:
+                // In preview form, just use the codename; this matches how the SDK
+                // describes itself, e.g. S (stable) is
+                //    Pkg.Desc=Android SDK Platform 12
+                // and T (preview) is
+                //    Pkg.Desc=Android SDK Platform Tiramisu
+                return getCodeName(api);
             // If you add more versions here, also update #getBuildCodes and
             // #HIGHEST_KNOWN_API
 
@@ -215,6 +224,8 @@ public class SdkVersionInfo {
                 return "S";
             case 32:
                 return "Sv2";
+            case 33:
+                return "Tiramisu";
             // If you add more versions here, also update #getBuildCodes and
             // #HIGHEST_KNOWN_API
 
@@ -266,8 +277,9 @@ public class SdkVersionInfo {
             case 29: return "Q";
             case 30: return "R";
             case 31: return "S";
-            case 32:
-                return "Sv2";
+            case 32: return "S_V2";
+            case 33:
+                return "TIRAMISU";
                 // If you add more versions here, also update #getCodeName and
                 // #HIGHEST_KNOWN_API
         }
@@ -321,7 +333,7 @@ public class SdkVersionInfo {
             codeName = codeName.replace("KIT_KAT", "KITKAT");
         }
 
-        int code = getApiByBuildCode(codeName, recognizeUnknowns);
+        int code = getApiByBuildCode(codeName, false);
         if (code == -1) {
             for (int api = 1; api <= HIGHEST_KNOWN_API; api++) {
                 String c = getCodeName(api);
@@ -332,6 +344,11 @@ public class SdkVersionInfo {
             if (previewName.equalsIgnoreCase("KeyLimePie")) {
                 return 19;
             }
+
+            if (recognizeUnknowns) {
+                code = getApiByBuildCode(codeName, true);
+            }
+
         }
         return code;
     }
diff --git a/sdklib/src/test/java/com/android/sdklib/SdkVersionInfoTest.java b/sdklib/src/test/java/com/android/sdklib/SdkVersionInfoTest.java
index b25397a831..4c31fa8b27 100644
--- a/sdklib/src/test/java/com/android/sdklib/SdkVersionInfoTest.java
+++ b/sdklib/src/test/java/com/android/sdklib/SdkVersionInfoTest.java
@@ -49,6 +49,14 @@ public class SdkVersionInfoTest extends TestCase {
         assertEquals("API 29: Android 10.0 (Q)", SdkVersionInfo.getAndroidName(29));
         assertEquals("API 30: Android 11.0 (R)", SdkVersionInfo.getAndroidName(30));
         assertEquals("API 31: Android 12.0 (S)", SdkVersionInfo.getAndroidName(31));
+        assertEquals("API 32: Android 12L (Sv2)", SdkVersionInfo.getAndroidName(32));
+        assertEquals(
+                // "13.0" here is a future guess to make the test likely to continue passing
+                // after whoever updates HIGHEST_KNOWN_STABLE_API, not an exclusive announcement :-)
+                HIGHEST_KNOWN_STABLE_API < 33 ? "API 33: Android Tiramisu" : "API 33: Android 13.0 (T)",
+                SdkVersionInfo.getAndroidName(33)
+        );
+
         // Future: if we don't have a name, don't include "null" as a name
         assertEquals("API 500", SdkVersionInfo.getAndroidName(500));
     }
@@ -76,6 +84,8 @@ public class SdkVersionInfoTest extends TestCase {
         assertEquals(28, getApiByPreviewName("Pie", false));
         assertEquals(29, getApiByPreviewName("Q", false));
         assertEquals(30, getApiByPreviewName("R", true));
+        assertEquals(32, getApiByPreviewName("S_V2", true));
+        assertEquals(32, getApiByPreviewName("Sv2", true));
 
         assertEquals(-1, getApiByPreviewName("UnknownName", false));
         assertEquals(HIGHEST_KNOWN_API + 1, getApiByPreviewName("UnknownName", true));
@@ -90,6 +100,7 @@ public class SdkVersionInfoTest extends TestCase {
         assertEquals(28, getApiByBuildCode("P", true));
         assertEquals(29, getApiByBuildCode("Q", true));
         assertEquals(30, getApiByBuildCode("R", true));
+        assertEquals(32, getApiByBuildCode("S_V2", true));
 
         for (int api = 1; api <= HIGHEST_KNOWN_API; api++) {
             assertEquals(api, getApiByBuildCode(getBuildCode(api), false));