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 am: 48857bdb24

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22797727

Change-Id: I5448754522ed9e8d50d0d25c0a0b98565fc8a958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Buynytskyy
2023-04-23 00:32:12 +00:00
committed by Automerger Merge Worker
parent 652c19eb38 48857bdb24
commit f4e89b4877
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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},