Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03f26722 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "PackageManager: Let system-defined permissions take precedence over settings" into cm-10.2

parents ebed47ce 120aee8e

services/java/com/android/server/pm/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,12 @@ final class Settings { 
                final String name = parser.getAttributeValue(null, ATTR_NAME);

                final String sourcePackage = parser.getAttributeValue(null, "package");

                final String ptype = parser.getAttributeValue(null, "type");

                BasePermission tp = mPermissions.get(name);

                if (tp != null) {

                    Log.v(PackageManagerService.TAG, "Permission " + name + " became a builtin " +

                          "since configuration was generated, skipping it");

                    continue;

                }

                if (name != null && sourcePackage != null) {

                    final boolean dynamic = "dynamic".equals(ptype);

                    final BasePermission bp = new BasePermission(name, sourcePackage,