Merge "iris cleanup unused methods" (8291c45d) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -130,17 +130,6 @@ class AccessCheckingService(context: Context) : SystemService(context) {
		}
		} as IndexedMap<String, IndexedListSet<String>>

		fun getDecision(subject: AccessUri, `object`: AccessUri): Int =
		getState {
		with(policy) { getDecision(subject, `object`) }
		}

		fun setDecision(subject: AccessUri, `object`: AccessUri, decision: Int) {
		mutateState {
		with(policy) { setDecision(subject, `object`, decision) }
		}
		}

		internal fun onUserAdded(userId: Int) {
		mutateState {
		with(policy) { onUserAdded(userId) }

+0 −15

Original line number	Diff line number	Diff line
		@@ -56,13 +56,6 @@ class AccessPolicy private constructor(
		"Scheme policy for $subjectScheme and $objectScheme does not exist"
		}

		fun GetStateScope.getDecision(subject: AccessUri, `object`: AccessUri): Int =
		with(getSchemePolicy(subject, `object`)) { getDecision(subject, `object`) }

		fun MutateStateScope.setDecision(subject: AccessUri, `object`: AccessUri, decision: Int) {
		with(getSchemePolicy(subject, `object`)) { setDecision(subject, `object`, decision) }
		}

		fun initialize(
		state: MutableAccessState,
		userIds: IntSet,
		@@ -494,14 +487,6 @@ abstract class SchemePolicy {

		abstract val objectScheme: String

		abstract fun GetStateScope.getDecision(subject: AccessUri, `object`: AccessUri): Int

		abstract fun MutateStateScope.setDecision(
		subject: AccessUri,
		`object`: AccessUri,
		decision: Int
		)

		open fun GetStateScope.onStateMutated() {}

		open fun MutateStateScope.onInitialized() {}

+0 −18

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

		import android.app.AppOpsManager
		import com.android.server.permission.access.AccessUri
		import com.android.server.permission.access.AppOpUri
		import com.android.server.permission.access.GetStateScope
		import com.android.server.permission.access.MutableAccessState
		import com.android.server.permission.access.MutateStateScope
		@@ -40,22 +38,6 @@ class AppIdAppOpPolicy : BaseAppOpPolicy(AppIdAppOpPersistence()) {
		override val subjectScheme: String
		get() = UidUri.SCHEME

		override fun GetStateScope.getDecision(subject: AccessUri, `object`: AccessUri): Int {
		subject as UidUri
		`object` as AppOpUri
		return getAppOpMode(subject.appId, subject.userId, `object`.appOpName)
		}

		override fun MutateStateScope.setDecision(
		subject: AccessUri,
		`object`: AccessUri,
		decision: Int
		) {
		subject as UidUri
		`object` as AppOpUri
		setAppOpMode(subject.appId, subject.userId, `object`.appOpName, decision)
		}

		override fun GetStateScope.onStateMutated() {
		onAppOpModeChangedListeners.forEachIndexed { _, it -> it.onStateMutated() }
		}

+0 −18

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

		import android.app.AppOpsManager
		import com.android.server.permission.access.AccessUri
		import com.android.server.permission.access.AppOpUri
		import com.android.server.permission.access.GetStateScope
		import com.android.server.permission.access.MutableAccessState
		import com.android.server.permission.access.MutateStateScope
		@@ -40,22 +38,6 @@ class PackageAppOpPolicy : BaseAppOpPolicy(PackageAppOpPersistence()) {
		override val subjectScheme: String
		get() = PackageUri.SCHEME

		override fun GetStateScope.getDecision(subject: AccessUri, `object`: AccessUri): Int {
		subject as PackageUri
		`object` as AppOpUri
		return getAppOpMode(subject.packageName, subject.userId, `object`.appOpName)
		}

		override fun MutateStateScope.setDecision(
		subject: AccessUri,
		`object`: AccessUri,
		decision: Int
		) {
		subject as PackageUri
		`object` as AppOpUri
		setAppOpMode(subject.packageName, subject.userId, `object`.appOpName, decision)
		}

		override fun GetStateScope.onStateMutated() {
		onAppOpModeChangedListeners.forEachIndexed { _, it -> it.onStateMutated() }
		}

+0 −17

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import com.android.internal.os.RoSystemProperties
		import com.android.modules.utils.BinaryXmlPullParser
		import com.android.modules.utils.BinaryXmlSerializer
		import com.android.server.permission.access.AccessState
		import com.android.server.permission.access.AccessUri
		import com.android.server.permission.access.GetStateScope
		import com.android.server.permission.access.MutableAccessState
		import com.android.server.permission.access.MutateStateScope
		@@ -67,22 +66,6 @@ class AppIdPermissionPolicy : SchemePolicy() {
		override val objectScheme: String
		get() = PermissionUri.SCHEME

		override fun GetStateScope.getDecision(subject: AccessUri, `object`: AccessUri): Int {
		subject as UidUri
		`object` as PermissionUri
		return getPermissionFlags(subject.appId, subject.userId, `object`.permissionName)
		}

		override fun MutateStateScope.setDecision(
		subject: AccessUri,
		`object`: AccessUri,
		decision: Int
		) {
		subject as UidUri
		`object` as PermissionUri
		setPermissionFlags(subject.appId, subject.userId, `object`.permissionName, decision)
		}

		override fun GetStateScope.onStateMutated() {
		onPermissionFlagsChangedListeners.forEachIndexed { _, it -> it.onStateMutated() }
		}