commit 67a461eca888243e1f4960e662aa2059c90da629
author Svet Ganov <svetoslavganov@google.com> Wed Jul 01 00:55:40 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 01 00:55:58 2015 +0000
tree 472e141603e54de1086fd288bd040d13a26c703a
parent 63c4a7185cf1b03ba45cc3147e87270502334387
parent ffd25bbed1345a932b1338a210405d1f42daf07b

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

core/java/android/content/pm/PackageParser.java

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