Merge "Allow permission group updates" into nyc-mr1-dev (ee2df039) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -8649,7 +8649,9 @@ public class PackageManagerService extends IPackageManager.Stub {
		for (i=0; i<N; i++) {
		PackageParser.PermissionGroup pg = pkg.permissionGroups.get(i);
		PackageParser.PermissionGroup cur = mPermissionGroups.get(pg.info.name);
		if (cur == null) {
		final String curPackageName = cur == null ? null : cur.info.packageName;
		final boolean isPackageUpdate = pg.info.packageName.equals(curPackageName);
		if (cur == null \|\| isPackageUpdate) {
		mPermissionGroups.put(pg.info.name, pg);
		if ((policyFlags&PackageParser.PARSE_CHATTY) != 0) {
		if (r == null) {
		@@ -8657,6 +8659,9 @@ public class PackageManagerService extends IPackageManager.Stub {
		} else {
		r.append(' ');
		}
		if (isPackageUpdate) {
		r.append("UPD:");
		}
		r.append(pg.info.name);
		}
		} else {