diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java index c409c4ea96..9f8ff7dbd5 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java @@ -194,6 +194,8 @@ private int mapSdkShorthandToVersion(String sdkVersion) { return ResConfigFlags.SDK_UPSIDEDOWN_CAKE; case "VANILLAICECREAM": case "VANILLA_ICE_CREAM": + return ResConfigFlags.SDK_VANILLA_ICE_CREAM; + case "SDK_CUR_DEVELOPMENT": 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 1d27b77eea..26bd7bd797 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 @@ -569,6 +569,7 @@ public int hashCode() { public final static byte SDK_S_V2 = 32; public final static byte SDK_TIRAMISU = 33; public final static byte SDK_UPSIDEDOWN_CAKE = 34; + public final static byte SDK_VANILLA_ICE_CREAM = 35; // AOSP has this as 10,000 for dev purposes. // platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d diff --git a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar index beeeb2bb13..3e79d4bcae 100644 Binary files a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar and b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar differ diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/apk/InvalidSdkBoundingTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/apk/InvalidSdkBoundingTest.java index d3f4c85024..9c6800bc7f 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/apk/InvalidSdkBoundingTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/apk/InvalidSdkBoundingTest.java @@ -100,7 +100,7 @@ public void checkForSdkDevelopmentInsaneTestValue() { ApkInfo apkInfo = new ApkInfo(); Map sdkInfo = new LinkedHashMap<>(); - sdkInfo.put("targetSdkVersion", "VANILLAICECREAM"); + sdkInfo.put("targetSdkVersion", "SDK_CUR_DEVELOPMENT"); apkInfo.setSdkInfo(sdkInfo); assertEquals("10000", apkInfo.checkTargetSdkVersionBounds());