Merge "Revert^2 "Fix NPEs in {AppId,Package}AppOpPolicy"" into main (8848f964) · Commits · e / os / android_frameworks_base

services/permission/java/com/android/server/permission/access/appop/AppIdAppOpPolicy.kt

+9 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server.permission.access.appop

		import android.app.AppOpsManager
		import android.util.Slog
		import com.android.server.permission.access.GetStateScope
		import com.android.server.permission.access.MutableAccessState
		import com.android.server.permission.access.MutateStateScope
		@@ -84,6 +85,10 @@ class AppIdAppOpPolicy : BaseAppOpPolicy(AppIdAppOpPersistence()) {
		appOpName: String,
		mode: Int
		): Boolean {
		if (userId !in newState.userStates) {
		Slog.e(LOG_TAG, "Unable to set app op mode for missing user $userId")
		return false
		}
		val defaultMode = AppOpsManager.opToDefaultMode(appOpName)
		val oldMode =
		newState.userStates[userId]!!
		@@ -152,4 +157,8 @@ class AppIdAppOpPolicy : BaseAppOpPolicy(AppIdAppOpPersistence()) {
		*/
		abstract fun onStateMutated()
		}

		companion object {
		private val LOG_TAG = AppIdAppOpPolicy::class.java.simpleName
		}
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server.permission.access.appop

		import android.app.AppOpsManager
		import android.util.Slog
		import com.android.server.permission.access.GetStateScope
		import com.android.server.permission.access.MutableAccessState
		import com.android.server.permission.access.MutateStateScope
		@@ -87,6 +88,10 @@ class PackageAppOpPolicy : BaseAppOpPolicy(PackageAppOpPersistence()) {
		appOpName: String,
		mode: Int
		): Boolean {
		if (userId !in newState.userStates) {
		Slog.e(LOG_TAG, "Unable to set app op mode for missing user $userId")
		return false
		}
		val defaultMode = AppOpsManager.opToDefaultMode(appOpName)
		val oldMode =
		newState.userStates[userId]!!
		@@ -155,4 +160,8 @@ class PackageAppOpPolicy : BaseAppOpPolicy(PackageAppOpPersistence()) {
		*/
		abstract fun onStateMutated()
		}

		companion object {
		private val LOG_TAG = PackageAppOpPolicy::class.java.simpleName
		}
		}