From 70d941d18d6a06c9cc90a7433515176caade9594 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
Date: Sun, 2 Jul 2023 05:35:45 -0400
Subject: [PATCH] feat: support upside-down-cake/vanilla-ice-cream sdk
 shorthand (#3113)

---
 .../src/main/java/brut/androlib/res/AndrolibResources.java   | 5 +++++
 .../src/main/java/brut/androlib/res/data/ResConfigFlags.java | 2 +-
 .../java/brut/androlib/androlib/InvalidSdkBoundingTest.java  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
index 8d5ddcae..c75950e9 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
@@ -699,6 +699,11 @@ final public class AndrolibResources {
                 return ResConfigFlags.SDK_S_V2;
             case "T":
             case "TIRAMISU":
+                return ResConfigFlags.SDK_TIRAMISU;
+            case "UPSIDEDOWNCAKE":
+            case "UPSIDE_DOWN_CAKE":
+            case "VANILLAICECREAM":
+            case "VANILLA_ICE_CREAM":
                 return ResConfigFlags.SDK_DEVELOPMENT;
             default:
                 return Integer.parseInt(sdkVersion);
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
index 40963eba..18399add 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
@@ -538,7 +538,7 @@ public class ResConfigFlags {
     public final static byte SDK_R = 30;
     public final static byte SDK_S = 31;
     public final static byte SDK_S_V2 = 32;
-    public final static byte SDK_T = 33;
+    public final static byte SDK_TIRAMISU = 33;
 
     // AOSP has this as 10,000 for dev purposes.
     // platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/androlib/InvalidSdkBoundingTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/androlib/InvalidSdkBoundingTest.java
index 345ada3e..5cd15744 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/androlib/InvalidSdkBoundingTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/androlib/InvalidSdkBoundingTest.java
@@ -101,7 +101,7 @@ public class InvalidSdkBoundingTest extends BaseTest {
         AndrolibResources androlibResources = new AndrolibResources();
 
         Map<String, String> sdkInfo = new LinkedHashMap<>();
-        sdkInfo.put("targetSdkVersion", "T");
+        sdkInfo.put("targetSdkVersion", "VANILLAICECREAM");
 
         androlibResources.setSdkInfo(sdkInfo);
         assertEquals("10000", androlibResources.checkTargetSdkVersionBounds());