Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91331e5b authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

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
parent 79523b5a

tools/aapt2/dump/DumpManifest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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,