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

Commit 25b63c7b authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev 

am: 0d11c91d

Change-Id: I27d82f39f3063a9d03a5e4973c45c39e7f0054f6
parents d0aef6b7 0d11c91d

tools/aapt2/integration-tests/AppOne/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.aapt.app.one" coreApp="true">

    <uses-sdk android:minSdkVersion="21" />



    <uses-permission-sdk-23 android:name="android.permission.TEST" android:maxSdkVersion="22" />

</manifest>

tools/aapt2/link/ManifestFixer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 
  manifest_action["original-package"];

  manifest_action["protected-broadcast"];

  manifest_action["uses-permission"];

  manifest_action["uses-permission-sdk-23"];

  manifest_action["permission"];

  manifest_action["permission-tree"];

  manifest_action["permission-group"];