Merge "Invert the DONT_AUTO_REVOKE permission flag" (07e684f5) · Commits · e / os / android_packages_apps_PackageInstaller

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -1407,10 +1407,10 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
		\| (permission.isReviewRequired()
		? PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED : 0)
		\| (permission.isOneTime() ? PackageManager.FLAG_PERMISSION_ONE_TIME : 0)
		\| (permission.isDontAutoRevoke()
		? PackageManager.FLAG_PERMISSION_DONT_AUTO_REVOKE : 0)
		\| (permission.isDontAutoRevokeUserSet()
		? PackageManager.FLAG_PERMISSION_DONT_AUTO_REVOKE_USER_SET : 0);
		\| (permission.isAutoRevoke()
		? PackageManager.FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED : 0)
		\| (permission.isAutoRevokeUserSet()
		? PackageManager.FLAG_PERMISSION_AUTO_REVOKE_USER_SET : 0);

		mPackageManager.updatePermissionFlags(permission.getName(),
		mPackageInfo.packageName,

+6 −6

Original line number	Diff line number	Diff line
		@@ -262,17 +262,17 @@ public final class Permission {
		}

		/**
		* @see PackageManager#FLAG_PERMISSION_DONT_AUTO_REVOKE
		* @see PackageManager#FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED
		*/
		public boolean isDontAutoRevoke() {
		return (mFlags & PackageManager.FLAG_PERMISSION_DONT_AUTO_REVOKE) != 0;
		public boolean isAutoRevoke() {
		return (mFlags & PackageManager.FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED) != 0;
		}

		/**
		* @see PackageManager#FLAG_PERMISSION_DONT_AUTO_REVOKE_USER_SET
		* @see PackageManager#FLAG_PERMISSION_AUTO_REVOKE_USER_SET
		*/
		public boolean isDontAutoRevokeUserSet() {
		return (mFlags & PackageManager.FLAG_PERMISSION_DONT_AUTO_REVOKE_USER_SET) != 0;
		public boolean isAutoRevokeUserSet() {
		return (mFlags & PackageManager.FLAG_PERMISSION_AUTO_REVOKE_USER_SET) != 0;
		}

		public void setUserSet(boolean userSet) {