Merge "Watch app ops for all runtime permissions." (012117e8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PermissionPolicyService.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -152,10 +152,10 @@ public final class PermissionPolicyService extends SystemService {
	for (int i = 0; i < numDangerousPerms; i++) {		for (int i = 0; i < numDangerousPerms; i++) {
	PermissionInfo perm = dangerousPerms.get(i);		PermissionInfo perm = dangerousPerms.get(i);

	if (perm.isHardRestricted() \|\| perm.backgroundPermission != null) {		if (perm.isRuntime()) {
	appOpsService.startWatchingMode(getSwitchOp(perm.name), null, appOpsListener);
	} else if (perm.isSoftRestricted()) {
	appOpsService.startWatchingMode(getSwitchOp(perm.name), null, appOpsListener);		appOpsService.startWatchingMode(getSwitchOp(perm.name), null, appOpsListener);
			}
			if (perm.isSoftRestricted()) {
	SoftRestrictedPermissionPolicy policy =		SoftRestrictedPermissionPolicy policy =
	SoftRestrictedPermissionPolicy.forPermission(null, null, null,		SoftRestrictedPermissionPolicy.forPermission(null, null, null,
	perm.name);		perm.name);