summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-06-29 18:27:20 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2015-06-30 23:06:41 +0000
commitffd25bbed1345a932b1338a210405d1f42daf07b (patch)
tree491374d1f2c6a64839e8ae7f036362ce18e90fe2 /core/java/android
parente3fc5415ed65ee7ad451069022b5405361aeb2e7 (diff)
downloadframeworks_base-ffd25bbed1345a932b1338a210405d1f42daf07b.zip
frameworks_base-ffd25bbed1345a932b1338a210405d1f42daf07b.tar.gz
frameworks_base-ffd25bbed1345a932b1338a210405d1f42daf07b.tar.bz2
Rename uses-permission-m to uses-permission-23
bug:20072113 Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PackageParser.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index faf71ee..64376c1 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -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;
}