Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "V-udc-dev-plus-aosp" into udc-dev-plus-aosp

Browse Source 
* changes:
  Add VanillaIceCream to aapt2 codenames
  Revert "DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build""
This commit is contained in:
Alex Buynytskyy
2023-04-23 00:02:57 +00:00
committed by Android (Google) Code Review
parent 63e579859c a0029778bf
commit 48857bdb24
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -32653,6 +32653,7 @@ package android.os {
field public static final int S_V2 = 32; // 0x20 field public static final int S_V2 = 32; // 0x20
field public static final int TIRAMISU = 33; // 0x21 field public static final int TIRAMISU = 33; // 0x21
field public static final int UPSIDE_DOWN_CAKE = 34; // 0x22 field public static final int UPSIDE_DOWN_CAKE = 34; // 0x22
field public static final int VANILLA_ICE_CREAM = 10000; // 0x2710
} }
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

5
core/java/android/os/Build.java
View File

@@ -1223,6 +1223,11 @@ public class Build {
* Upside Down Cake. * Upside Down Cake.
*/ */
public static final int UPSIDE_DOWN_CAKE = 34; public static final int UPSIDE_DOWN_CAKE = 34;
/**
* Vanilla Ice Cream.
*/
public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */

4
tools/aapt2/SdkConstants.cpp
View File

@@ -26,8 +26,8 @@ using android::StringPiece;
namespace aapt { namespace aapt {
static ApiVersion sDevelopmentSdkLevel = 10000; static ApiVersion sDevelopmentSdkLevel = 10000;
static const auto sDevelopmentSdkCodeNames = static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>(
std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"}); {"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake", "VanillaIceCream"});
static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
{0x021c, 1}, {0x021c, 1},