Merge "Cork PackageInfo cache for onStorageVolumeMounted() and onUserCreated()." (9ae09da8) · Commits · e / os / android_frameworks_base

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

+15 −2

Original line number	Diff line number	Diff line
		@@ -2009,8 +2009,10 @@ class PermissionService(
		}

		override fun onUserCreated(userId: Int) {
		withCorkedPackageInfoCache {
		service.onUserAdded(userId)
		}
		}

		override fun onUserRemoved(userId: Int) {
		service.onUserRemoved(userId)
		@@ -2024,8 +2026,10 @@ class PermissionService(
		packageNames = storageVolumePackageNames.remove(volumeUuid) ?: emptyList()
		mountedStorageVolumes += volumeUuid
		}
		withCorkedPackageInfoCache {
		service.onStorageVolumeMounted(volumeUuid, packageNames, fingerprintChanged)
		}
		}

		override fun onPackageAdded(
		packageState: PackageState,
		@@ -2120,6 +2124,15 @@ class PermissionService(
		}
		}

		private inline fun <T> withCorkedPackageInfoCache(block: () -> T): T {
		PackageManager.corkPackageInfoCache()
		try {
		return block()
		} finally {
		PackageManager.uncorkPackageInfoCache()
		}
		}

		/**
		* Check whether a UID is root or system UID.
		*/