diff options
| author | 2020-09-30 12:58:47 +0000 | |
|---|---|---|
| committer | 2020-10-01 07:41:01 +0000 | |
| commit | 91331e5b55d9399ac6f3abf2f5ef402c5dc85c08 (patch) | |
| tree | d8a4d5542087b870430bb4b156b72ab34475ed3f | |
| parent | 79523b5afa96dca991180077f5ec7886cc58fb1b (diff) | |
Fix mismatch in the REQUIRED_(NOT_)FEATURE_ATTR ids
Fix the values of REQUIRED_FEATURE_ATTR and REQUIRED_NOT_FEATURE_ATTR to
match 'requiredFeature' (0x01010554) and 'requiredNotFeature'
(0x01010555) from frameworks/base/core/res/res/values/public.xml
correspondingly.
Bug: 169812610
Test: make aapt2
Test: make aapt2_tests
Test: out/host/linux-x86/nativetest64/aapt2_tests/aapt2_tests
Test: Create manifest with 'required(Not)Permission' in <uses-permission/>
Test: aapt2 link -o out.apk -I $ANDROID_SDK/platforms/android-30/android.jar --manifest AndroidManifest.xml -v
Test: aapt2 dump badging out.apk
Change-Id: Ia1c785cde80bc8394231248119418d5bc5bf456d
| -rw-r--r-- | tools/aapt2/dump/DumpManifest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/dump/DumpManifest.cpp b/tools/aapt2/dump/DumpManifest.cpp index 71c70da96109..74978696fdd5 100644 --- a/tools/aapt2/dump/DumpManifest.cpp +++ b/tools/aapt2/dump/DumpManifest.cpp @@ -79,8 +79,8 @@ enum { ISGAME_ATTR = 0x10103f4, VERSION_ATTR = 0x01010519, CERT_DIGEST_ATTR = 0x01010548, - REQUIRED_FEATURE_ATTR = 0x01010557, - REQUIRED_NOT_FEATURE_ATTR = 0x01010558, + REQUIRED_FEATURE_ATTR = 0x01010554, + REQUIRED_NOT_FEATURE_ATTR = 0x01010555, IS_STATIC_ATTR = 0x0101055a, REQUIRED_SYSTEM_PROPERTY_NAME_ATTR = 0x01010565, REQUIRED_SYSTEM_PROPERTY_VALUE_ATTR = 0x01010566, |