Merge "Skip reporting onPackageUninstalled() if it's package removal." into main (0f5332f7) · Commits · e / os / android_frameworks_base

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

+9 −8

Original line number	Diff line number	Diff line
		@@ -2504,6 +2504,8 @@ class PermissionService(private val service: AccessCheckingService) :
		return
		}

		val packageState = packageManagerInternal.packageStates[packageName]
		if (packageState != null) {
		val userIds =
		if (userId == UserHandle.USER_ALL) {
		userManagerService.userIdsIncludingPreCreated
		@@ -2511,8 +2513,7 @@ class PermissionService(private val service: AccessCheckingService) :
		intArrayOf(userId)
		}
		userIds.forEach { service.onPackageUninstalled(packageName, appId, it) }
		val packageState = packageManagerInternal.packageStates[packageName]
		if (packageState == null) {
		} else {
		service.onPackageRemoved(packageName, appId)
		}
		}