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

am 67a461ec: Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev

Browse Source 
* commit '67a461eca888243e1f4960e662aa2059c90da629':
  Rename uses-permission-m to uses-permission-23
This commit is contained in:
Svet Ganov
2015-07-01 01:00:38 +00:00
committed by Android Git Automerger
parent 93ed98580c 67a461eca8
commit aadc90b51c
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)) {
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)) {
return null;
}