From f453228161bc09d14ec7b7f90f574ca0a439f35f Mon Sep 17 00:00:00 2001
From: Yurii Zubrytskyi <zyy@google.com>
Date: Mon, 4 Apr 2022 22:53:03 -0700
Subject: [PATCH] frameworks/base - Tiramisu is now 33 #2

Set current API level

Test: Build and boot
Bug: 225745567
Change-Id: If135d9795e812cc286c720b9351eaf6be621fd5b
---
 core/api/current.txt            | 2 +-
 core/java/android/os/Build.java | 2 +-
 tools/aapt/SdkConstants.h       | 1 +
 tools/aapt2/SdkConstants.h      | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 2a6536ed218f5..410bbb27f154b 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -30977,7 +30977,7 @@ package android.os {
     field public static final int R = 30; // 0x1e
     field public static final int S = 31; // 0x1f
     field public static final int S_V2 = 32; // 0x20
-    field public static final int TIRAMISU = 10000; // 0x2710
+    field public static final int TIRAMISU = 33; // 0x21
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 42e6ac4df8af9..0b956f8bf9e0a 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1166,7 +1166,7 @@ public class Build {
         /**
          * Tiramisu.
          */
-        public static final int TIRAMISU = CUR_DEVELOPMENT;
+        public static final int TIRAMISU = 33;
     }
 
     /** The type of build, like "user" or "eng". */
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index f57c4ee9d5b64..a146466402f68 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -48,6 +48,7 @@ enum {
     SDK_R = 30,
     SDK_S = 31,
     SDK_S_V2 = 32,
+    SDK_TIRAMISU = 33,
     SDK_CUR_DEVELOPMENT = 10000,
 };
 
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index f2aaaf5ddcf0e..0bd61c04f2b23 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -58,6 +58,7 @@ enum : ApiVersion {
   SDK_R = 30,
   SDK_S = 31,
   SDK_S_V2 = 32,
+  SDK_TIRAMISU = 33,
   SDK_CUR_DEVELOPMENT = 10000,
 };