Merge "Reset virtual device permissions" into main (4f30ee74) · Commits · e / os / android_frameworks_base

services/permission/java/com/android/server/permission/access/permission/DevicePermissionPolicy.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,10 +85,10 @@ class DevicePermissionPolicy : SchemePolicy() {
		appId: Int,
		userId: Int
		) {
		resetPermissionStates(packageName, userId)
		resetRuntimePermissions(packageName, userId)
		}

		private fun MutateStateScope.resetPermissionStates(packageName: String, userId: Int) {
		fun MutateStateScope.resetRuntimePermissions(packageName: String, userId: Int) {
		// It's okay to skip resetting permissions for packages that are removed,
		// because their states will be trimmed in onPackageRemoved()/onAppIdRemoved()
		val packageState = newState.externalState.packageStates[packageName] ?: return

+6 −0

Original line number	Diff line number	Diff line
		@@ -1738,6 +1738,9 @@ class PermissionService(
		with(policy) {
		resetRuntimePermissions(androidPackage.packageName, userId)
		}
		with(devicePolicy) {
		resetRuntimePermissions(androidPackage.packageName, userId)
		}
		}
		}

		@@ -1748,6 +1751,9 @@ class PermissionService(
		with(policy) {
		resetRuntimePermissions(packageState.packageName, userId)
		}
		with(devicePolicy) {
		resetRuntimePermissions(packageState.packageName, userId)
		}
		}
		}
		}