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

Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev

Browse Source
This commit is contained in:
Svet Ganov
2015-07-01 00:55:40 +00:00
committed by Android (Google) Code Review
parent 63c4a7185c ffd25bbed1
commit 67a461eca8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/PackageParser.java
View File

@@ -1505,7 +1505,8 @@ public class PackageParser {
if (!parseUsesPermission(pkg, res, parser, attrs)) { if (!parseUsesPermission(pkg, res, parser, attrs)) {
return null; return null;
} }
} else if (tagName.equals("uses-permission-sdk-m")) { } else if (tagName.equals("uses-permission-sdk-m")
|| tagName.equals("uses-permission-sdk-23")) {
if (!parseUsesPermission(pkg, res, parser, attrs)) { if (!parseUsesPermission(pkg, res, parser, attrs)) {
return null; return null;
} }