Merge "Revert "Temporarily make false auto revokations more visible in droidfood"" into rvc-dev (f68abebd) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/permissioncontroller/permission/data/AutoRevokedPackagesLiveData.kt

+2 −8

Original line number	Diff line number	Diff line
		@@ -19,11 +19,8 @@ package com.android.permissioncontroller.permission.data
		import android.content.pm.PackageManager.FLAG_PERMISSION_AUTO_REVOKED
		import android.os.UserHandle
		import com.android.permissioncontroller.PermissionControllerApplication
		import com.android.permissioncontroller.permission.data.AutoRevokedPackagesLiveData.addSource
		import com.android.permissioncontroller.permission.data.PackagePermissionsLiveData.Companion.NON_RUNTIME_NORMAL_PERMS
		import com.android.permissioncontroller.permission.data.UnusedAutoRevokedPackagesLiveData.addSource
		import com.android.permissioncontroller.permission.service.getUnusedThresholdMs
		import com.android.permissioncontroller.permission.service.isInAutoRevokeDogfood
		import com.android.permissioncontroller.permission.utils.KotlinUtils

		/**
		@@ -195,11 +192,8 @@ object UnusedAutoRevokedPackagesLiveData
		for ((user, stats) in usageStatsLiveData.value!!) {
		for (stat in stats) {
		val userPackage = stat.packageName to user
		// TODO eugenesusla: temporarily showing packages regardless of
		// usage recency for troubleshooting
		val isOldEnoughToShow = (now - stat.lastTimeVisible) >= unusedThreshold \|\|
		isInAutoRevokeDogfood(PermissionControllerApplication.get())
		if (userPackage in autoRevokedPackages && !isOldEnoughToShow) {
		if (userPackage in autoRevokedPackages &&
		(now - stat.lastTimeVisible) < unusedThreshold) {
		unusedPackages.remove(userPackage)
		}
		}

+1 −8

Original line number	Diff line number	Diff line
		@@ -163,10 +163,6 @@ fun isAutoRevokeEnabled(context: Context): Boolean {
		getUnusedThresholdMs(context) != Long.MAX_VALUE
		}

		fun isInAutoRevokeDogfood(context: Context): Boolean {
		return TeamfoodSettings.get(context)?.enabledForPreRApps ?: false
		}

		/**
		* @return dump of auto revoke service as a proto
		*/
		@@ -278,10 +274,7 @@ private suspend fun revokePermissionsOnUnusedApps(
		lastTimeVisible = Math.max(lastTimeVisible, packageInfo.firstInstallTime)

		// Limit by first boot time
		// TODO eugenesusla: temporarily disabled for dogfooders for troubleshooting
		if (!isInAutoRevokeDogfood(context)) {
		lastTimeVisible = Math.max(lastTimeVisible, firstBootTime)
		}

		// Handle cross-profile apps
		if (context.isPackageCrossProfile(pkgName)) {