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

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

Browse Source
This commit is contained in:
Adam Lesinski
2017-05-12 23:53:56 +00:00
committed by Android (Google) Code Review
parent 05d41a7183 4b585db64f
commit 0d11c91d9e
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt2/integration-tests/AppOne/AndroidManifest.xml
View File

@@ -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>

1
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -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"];