API 35 Preview - Vanilla Ice Cream (#3696)

* fix: support API 35 as Vanilla Ice Cream

* feat: update internal framework to API 35 preview (Vanilla Ice Cream)

* chore: SDK_CUR_DEVELOPMENT is 10,000
This commit is contained in:
Connor Tumbleson 2024-09-18 07:16:33 -04:00 committed by GitHub
parent 674bb4208a
commit c6bb75e540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 1 deletions

View File

@ -194,6 +194,8 @@ public class ApkInfo implements YamlSerializable {
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);

View File

@ -569,6 +569,7 @@ public class ResConfigFlags {
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

View File

@ -100,7 +100,7 @@ public class InvalidSdkBoundingTest {
ApkInfo apkInfo = new ApkInfo();
Map<String, String> sdkInfo = new LinkedHashMap<>();
sdkInfo.put("targetSdkVersion", "VANILLAICECREAM");
sdkInfo.put("targetSdkVersion", "SDK_CUR_DEVELOPMENT");
apkInfo.setSdkInfo(sdkInfo);
assertEquals("10000", apkInfo.checkTargetSdkVersionBounds());