Snap for 6573866 from 1e829af82e27192fd20800dfff7cd83aa0544694 to rvc-release (aca80203) · Commits · e / os / android_packages_apps_PackageInstaller

res/layout-television/grant_permissions.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,13 @@
		android:text="@string/grant_dialog_button_allow"
		style="@style/GrantPermissions.ActionItem" />

		<Button
		android:id="@+id/permission_allow_foreground_only_button"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/grant_dialog_button_allow_foreground"
		style="@style/GrantPermissions.ActionItem" />

		<Button
		android:id="@+id/permission_allow_one_time_button"
		android:layout_width="match_parent"

src/com/android/permissioncontroller/Constants.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.permissioncontroller;

		import com.android.permissioncontroller.permission.service.AutoRevokeReGrantService;

		/**
		* App-global constants
		*/
		@@ -41,11 +39,6 @@ public class Constants {
		*/
		public static final int AUTO_REVOKE_JOB_ID = 2;

		/**
		* ID of the one-time job {@link AutoRevokeReGrantService}
		*/
		public static final int AUTO_REVOKE_REGRANT_JOB_ID = 3;

		/**
		* Name of file to containing the packages we already showed a notificaiton for.
		*

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

deleted100644 → 0

+0 −77

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.permissioncontroller.permission.data

		import android.app.Application
		import android.os.UserHandle
		import android.permission.PermissionManager
		import com.android.permissioncontroller.PermissionControllerApplication
		import com.android.permissioncontroller.permission.utils.Utils.getUserContext
		import kotlinx.coroutines.Job

		/**
		* A Livedata for the list of packages that have permissions that specified
		* {@code allowDontAutoRevokePermissions=true} in their {@code application} manifest declaration.
		*
		* @param app The current application
		* @param user The users the packages belong to
		*/
		class AutoRevokeManifestExemptPackagesLiveData(
		private val app: Application,
		private val user: UserHandle
		) : SmartAsyncMediatorLiveData<Set<String>>(), PackageBroadcastReceiver.PackageBroadcastListener {
		override fun onPackageUpdate(packageName: String) {
		updateAsync()
		}

		override suspend fun loadDataAndPostValue(job: Job) {
		if (job.isCancelled) {
		return
		}

		postValue(getUserContext(app, user)
		.getSystemService<PermissionManager>(PermissionManager::class.java)!!
		.autoRevokeExemptionGrantedPackages)
		}

		override fun onActive() {
		super.onActive()

		PackageBroadcastReceiver.addAllCallback(this)

		updateAsync()
		}

		override fun onInactive() {
		super.onInactive()

		PackageBroadcastReceiver.addAllCallback(this)
		}

		/**
		* Repository for AutoRevokeExemptionGrantedPackages
		*
		* <p> Key value is the user, value is its corresponding LiveData.
		*/
		companion object : DataRepositoryForPackage<UserHandle,
		AutoRevokeManifestExemptPackagesLiveData>() {
		override fun newValue(key: UserHandle): AutoRevokeManifestExemptPackagesLiveData {
		return AutoRevokeManifestExemptPackagesLiveData(PermissionControllerApplication.get(),
		key)
		}
		}
		}
		No newline at end of file

src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt

+28 −98

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ import android.os.Bundle
		import android.os.Process.myUserHandle
		import android.os.UserHandle
		import android.os.UserManager
		import android.permission.PermissionManager
		import android.printservice.PrintService
		import android.provider.DeviceConfig
		import android.provider.Settings
		@@ -85,8 +84,6 @@ import com.android.permissioncontroller.PermissionControllerStatsLog.PERMISSION_
		import com.android.permissioncontroller.R
		import com.android.permissioncontroller.permission.data.AllPackageInfosLiveData
		import com.android.permissioncontroller.permission.data.AppOpLiveData
		import com.android.permissioncontroller.permission.data.AutoRevokeManifestExemptPackagesLiveData
		import com.android.permissioncontroller.permission.data.AutoRevokeStateLiveData
		import com.android.permissioncontroller.permission.data.BroadcastReceiverLiveData
		import com.android.permissioncontroller.permission.data.CarrierPrivilegedStatusLiveData
		import com.android.permissioncontroller.permission.data.DataRepositoryForPackage
		@@ -120,7 +117,6 @@ import kotlinx.coroutines.GlobalScope
		import kotlinx.coroutines.Job
		import kotlinx.coroutines.async
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.withContext
		import java.util.Date
		import java.util.Random
		import java.util.concurrent.TimeUnit.DAYS
		@@ -228,8 +224,6 @@ class AutoRevokeOnBootReceiver : BroadcastReceiver() {
		DumpableLog.e(LOG_TAG,
		"Could not schedule ${AutoRevokeService::class.java.simpleName}: $status")
		}

		reGrantAutoRevokedPermissionsIfNeeded(context)
		}
		}

		@@ -249,7 +243,11 @@ private suspend fun revokePermissionsOnUnusedApps(
		// TODO ntmyren: remove once b/154796729 is fixed
		Log.i(LOG_TAG, "getting UserPackageInfoLiveData for all users " +
		"in AutoRevokePermissions")
		val unusedApps = AllPackageInfosLiveData.getInitializedValue().toMutableMap()
		val allPackagesByUser = AllPackageInfosLiveData.getInitializedValue()
		val allPackagesByUserByUid = allPackagesByUser.mapValues { (_, pkgs) ->
		pkgs.groupBy { pkg -> pkg.uid }
		}
		val unusedApps = allPackagesByUser.toMutableMap()

		val userStats = UsageStatsLiveData[getUnusedThresholdMs(context),
		if (DEBUG_OVERRIDE_THRESHOLDS) INTERVAL_DAILY else INTERVAL_MONTHLY].getInitializedValue()
		@@ -276,7 +274,13 @@ private suspend fun revokePermissionsOnUnusedApps(
		unusedUserApps = unusedUserApps.filter { packageInfo ->
		val pkgName = packageInfo.packageName

		var lastTimeVisible: Long = stats.lastTimeVisible(pkgName)
		val uidPackages = allPackagesByUserByUid[user]!![packageInfo.uid]
		?.map { info -> info.packageName } ?: emptyList()
		if (pkgName !in uidPackages) {
		Log.wtf(LOG_TAG, "Package $pkgName not among packages for " +
		"its uid ${packageInfo.uid}: $uidPackages")
		}
		var lastTimeVisible: Long = stats.lastTimeVisible(uidPackages)

		// Limit by install time
		lastTimeVisible = Math.max(lastTimeVisible, packageInfo.firstInstallTime)
		@@ -305,10 +309,6 @@ private suspend fun revokePermissionsOnUnusedApps(
		}
		}

		// TODO: Support more than the current user
		val manifestExemptPackages = AutoRevokeManifestExemptPackagesLiveData[myUserHandle()]
		.getInitializedValue()

		val revokedApps = mutableListOf<Pair<String, UserHandle>>()
		val userManager = context.getSystemService(UserManager::class.java)
		for ((user, userApps) in unusedApps) {
		@@ -326,7 +326,7 @@ private suspend fun revokePermissionsOnUnusedApps(
		}

		val packageName = pkg.packageName
		if (isPackageAutoRevokeExempt(context, pkg, manifestExemptPackages)) {
		if (isPackageAutoRevokeExempt(context, pkg)) {
		return@forEachInParallel
		}

		@@ -431,16 +431,20 @@ private suspend fun revokePermissionsOnUnusedApps(
		return revokedApps
		}

		private fun List<UsageStats>.lastTimeVisible(pkgName: String): Long {
		private fun List<UsageStats>.lastTimeVisible(pkgNames: List<String>): Long {
		var result = 0L
		for (stat in this) {
		if (stat.packageName == pkgName) {
		if (stat.packageName in pkgNames) {
		result = Math.max(result, stat.lastTimeVisible)
		}
		}
		return result
		}

		private fun List<UsageStats>.lastTimeVisible(pkgName: String): Long {
		return lastTimeVisible(listOf(pkgName))
		}

		/**
		* Checks if the given package is exempt from auto revoke in a way that's not user-overridable
		*/
		@@ -482,15 +486,6 @@ suspend fun isPackageAutoRevokePermanentlyExempt(
		suspend fun isPackageAutoRevokeExempt(
		context: Context,
		pkg: LightPackageInfo
		) = isPackageAutoRevokeExempt(context, pkg, withContext(IPC) {
		context.getSystemService<PermissionManager>()
		.getAutoRevokeExemptionGrantedPackages()
		})

		private suspend fun isPackageAutoRevokeExempt(
		context: Context,
		pkg: LightPackageInfo,
		manifestExemptPackages: Set<String>
		): Boolean {
		val packageName = pkg.packageName
		val packageUid = pkg.uid
		@@ -507,15 +502,11 @@ private suspend fun isPackageAutoRevokeExempt(
		return false
		}

		if (pkg.targetSdkVersion <= android.os.Build.VERSION_CODES.Q &&
		TeamfoodSettings.get(context)?.enabledForPreRApps != true) {
		// Q- packages exempt by default
		return true
		} else {
		// R+ packages only exempt with manifest attribute
		return packageName in manifestExemptPackages
		}
		// Q- packages exempt by default, except for dogfooding
		return pkg.targetSdkVersion <= android.os.Build.VERSION_CODES.Q &&
		TeamfoodSettings.get(context)?.enabledForPreRApps != true
		}
		// Check whether user/installer exempt
		return whitelistAppOpMode != MODE_ALLOWED
		}

		@@ -553,26 +544,6 @@ private val Context.firstBootTime: Long get() {
		return time
		}

		private fun reGrantAutoRevokedPermissionsIfNeeded(context: Context) {
		val sharedPreferences = context.sharedPreferences
		val key = "auto_revoke_regrant2_done"
		if (!sharedPreferences.getBoolean(key, false)) {
		val jobInfo = JobInfo.Builder(
		Constants.AUTO_REVOKE_REGRANT_JOB_ID,
		ComponentName(context, AutoRevokeReGrantService::class.java))
		.build()
		val status = context
		.getSystemService(JobScheduler::class.java)!!
		.schedule(jobInfo)
		if (status != JobScheduler.RESULT_SUCCESS) {
		DumpableLog.e(LOG_TAG,
		"Could not schedule ${AutoRevokeReGrantService::class.java.simpleName}: " +
		"$status")
		}
		sharedPreferences.edit().putBoolean(key, true).apply()
		}
		}

		/**
		* A job to check for apps unused in the last [getUnusedThresholdMs]ms every
		* [getCheckFrequencyMs]ms and [revokePermissionsOnUnusedApps] for them
		@@ -848,8 +819,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		val packageName: String,
		val firstInstallTime: Long,
		val lastTimeVisible: Long?,
		val isAutoRevokeManifestExempt: Boolean,
		val isAutoRevokeEnabled: Boolean,
		val implementedServices: List<String>,
		val groups: List<AutoRevokeDumpGroupData>
		) {
		@@ -858,8 +827,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		.setUid(uid)
		.setPackageName(packageName)
		.setFirstInstallTime(firstInstallTime)
		.setIsAutoRevokeManifestExempt(isAutoRevokeManifestExempt)
		.setIsAutoRevokeEnabled(isAutoRevokeEnabled)

		lastTimeVisible?.let { dump.lastTimeVisible = lastTimeVisible }

		@@ -900,10 +867,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		/** Exempt services for each user: user -> services */
		private var services: MutableMap<UserHandle, ExemptServicesLiveData>? = null

		/** Exempt packages for each user: user -> list<package-name> */
		private var autoRevokeManifestExemptPackages: MutableMap<UserHandle,
		AutoRevokeManifestExemptPackagesLiveData>? = null

		/** Usage stats: user -> list<usages> */
		private val usages = UsageStatsLiveData[
		getUnusedThresholdMs(context),
		@@ -923,13 +886,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		private var pkgPermGroupNames:
		MutableMap<Pair<UserHandle, String>, PackagePermissionsLiveData>? = null

		/**
		* Group names for packages
		* map<user, pkg-name> -> auto-revoke state. {@code null} before step 1
		*/
		private var pkgAutoRevokeState:
		MutableMap<Pair<UserHandle, String>, AutoRevokeStateLiveData>? = null

		/**
		* Group state for packages
		* map<(user, pkg-name) -> map<perm-group-name -> group>>, value {@code null} before step 2
		@@ -949,8 +905,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		addSource(users) {
		services?.values?.forEach { removeSource(it) }
		services = null
		autoRevokeManifestExemptPackages?.values?.forEach { removeSource(it) }
		autoRevokeManifestExemptPackages = null

		updateIfActive()
		}
		@@ -962,8 +916,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		addSource(packages) {
		pkgPermGroupNames?.values?.forEach { removeSource(it) }
		pkgPermGroupNames = null
		pkgAutoRevokeState?.values?.forEach { removeSource(it) }
		pkgAutoRevokeState = null
		pkgPermGroups.values.forEach { it?.values?.forEach { removeSource(it) } }

		updateIfActive()
		@@ -980,7 +932,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		// services/autoRevokeManifestExemptPackages step 1, users is loaded, nothing else
		if (users.isInitialized && services == null) {
		services = mutableMapOf()
		autoRevokeManifestExemptPackages = mutableMapOf()

		for (user in users.value!!) {
		val newServices = ExemptServicesLiveData[user]
		@@ -989,20 +940,12 @@ private class AutoRevokeDumpLiveData(context: Context) :
		addSource(newServices) {
		updateIfActive()
		}

		val newExemptPackages = AutoRevokeManifestExemptPackagesLiveData[user]
		autoRevokeManifestExemptPackages!![user] = newExemptPackages

		addSource(newExemptPackages) {
		updateIfActive()
		}
		}
		}

		// pkgPermGroupNames step 1, packages is loaded, nothing else
		if (packages.isInitialized && pkgPermGroupNames == null) {
		pkgPermGroupNames = mutableMapOf()
		pkgAutoRevokeState = mutableMapOf()

		for ((user, userPkgs) in packages.value!!) {
		for (pkg in userPkgs) {
		@@ -1015,13 +958,6 @@ private class AutoRevokeDumpLiveData(context: Context) :

		updateIfActive()
		}

		val newPkgAutoRevokeState = AutoRevokeStateLiveData[pkg.packageName, user]
		pkgAutoRevokeState!![user to pkg.packageName] = newPkgAutoRevokeState

		addSource(newPkgAutoRevokeState) {
		updateIfActive()
		}
		}
		}
		}
		@@ -1058,9 +994,7 @@ private class AutoRevokeDumpLiveData(context: Context) :
		pkgPermGroupNames?.values?.all { it.isInitialized } == true &&
		pkgPermGroupNames?.size == pkgPermGroups.size &&
		pkgPermGroups.values.all { it?.values?.all { it.isInitialized } == true } &&
		services?.values?.all { it.isInitialized } == true &&
		autoRevokeManifestExemptPackages?.values?.all { it.isInitialized } == true &&
		pkgAutoRevokeState?.values?.all { it.isInitialized } == true) {
		services?.values?.all { it.isInitialized } == true) {
		val users = mutableListOf<AutoRevokeDumpUserData>()

		for ((user, userPkgs) in packages.value!!) {
		@@ -1085,7 +1019,7 @@ private class AutoRevokeDumpLiveData(context: Context) :
		revokedPermGroupNames.value?.let {
		it[pkg.packageName to user]
		?.contains(groupName)
		} ?: false
		} == true
		))
		}
		}
		@@ -1094,10 +1028,6 @@ private class AutoRevokeDumpLiveData(context: Context) :
		pkgs.add(AutoRevokeDumpPackageData(pkg.uid, pkg.packageName,
		pkg.firstInstallTime,
		usages.value!![user]?.lastTimeVisible(pkg.packageName),
		autoRevokeManifestExemptPackages!![user]!!.value!!
		.contains(pkg.packageName),
		pkgAutoRevokeState!![user to pkg.packageName]!!.value
		?.isEnabledForApp == true,
		services!![user]?.value!![pkg.packageName] ?: emptyList(),
		groups))
		}

src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.proto

+0 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ message PackageProto {
		optional int64 first_install_time = 5;
		repeated PermissionGroupProto groups = 6;
		repeated string implemented_services = 7;
		optional bool is_auto_revoke_manifest_exempt = 8;
		optional bool is_auto_revoke_enabled = 9;
		}

		message PermissionGroupProto {