Merge "Do not disable app ops on a permission revocation for modern apps." into mnc-dev (e6c7e911) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -295,7 +295,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
		return false;
		}

		// Enable the permission app op before the permission grant.
		// Ensure the permission app op enabled before the permission grant.
		if (permission.hasAppOp() && !permission.isAppOpAllowed()) {
		permission.setAppOpAllowed(true);
		mAppOps.setMode(permission.getAppOp(), uid, mPackageInfo.packageName,
		@@ -385,13 +385,6 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
		return false;
		}

		// Disable the permission app op before the permission.
		if (permission.hasAppOp() && permission.isAppOpAllowed()) {
		permission.setAppOpAllowed(false);
		mAppOps.setMode(permission.getAppOp(), uid, mPackageInfo.packageName,
		AppOpsManager.MODE_IGNORED);
		}

		// Revoke the permission if needed.
		if (permission.isGranted()) {
		permission.setGranted(false);