Merge "Create a class in SettingsLib that creates an EnforcedAdmin that uses... (992e084d) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/supervision/SupervisionLog.kt

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.settingslib.supervision

		/** Constants used in supervision logs. */
		object SupervisionLog {
		const val TAG = "SupervisionSettings"
		}

packages/SettingsLib/src/com/android/settingslib/supervision/SupervisionRestrictionsHelper.kt

0 → 100644

+78 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.settingslib.supervision

		import android.app.admin.DeviceAdminReceiver
		import android.app.supervision.SupervisionManager
		import android.content.ComponentName
		import android.content.Context
		import android.content.Intent
		import android.content.pm.PackageManager
		import android.os.UserHandle
		import android.util.Log
		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin

		/** Helper class for supervision-enforced restrictions. */
		object SupervisionRestrictionsHelper {

		/**
		* Creates an instance of [EnforcedAdmin] that uses the correct supervision component or returns
		* null if supervision is not enabled.
		*/
		@JvmStatic
		fun createEnforcedAdmin(
		context: Context,
		restriction: String,
		user: UserHandle,
		): EnforcedAdmin? {
		val supervisionManager = context.getSystemService(SupervisionManager::class.java)
		val supervisionAppPackage = supervisionManager?.activeSupervisionAppPackage ?: return null
		var supervisionComponent: ComponentName? = null

		// Try to find the service whose package matches the active supervision app.
		val resolveSupervisionApps =
		context.packageManager.queryIntentServicesAsUser(
		Intent("android.app.action.BIND_SUPERVISION_APP_SERVICE"),
		PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS,
		user.identifier,
		)
		resolveSupervisionApps
		.mapNotNull { it.serviceInfo?.componentName }
		.find { it.packageName == supervisionAppPackage }
		?.let { supervisionComponent = it }

		if (supervisionComponent == null) {
		// Try to find the PO receiver whose package matches the active supervision app, for
		// backwards compatibility.
		val resolveDeviceAdmins =
		context.packageManager.queryBroadcastReceiversAsUser(
		Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
		PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS,
		user.identifier,
		)
		resolveDeviceAdmins
		.mapNotNull { it.activityInfo?.componentName }
		.find { it.packageName == supervisionAppPackage }
		?.let { supervisionComponent = it }
		}

		if (supervisionComponent == null) {
		Log.d(SupervisionLog.TAG, "Could not find the supervision component.")
		}
		return EnforcedAdmin(supervisionComponent, restriction, user)
		}
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/supervision/OWNERS

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		file:platform/frameworks/base:/core/java/android/app/supervision/OWNERS

packages/SettingsLib/tests/robotests/src/com/android/settingslib/supervision/SupervisionIntentProviderTest.kt

+4 −3

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.settingslib.supervision
		import android.app.supervision.SupervisionManager
		import android.content.Context
		import android.content.ContextWrapper
		import android.content.Intent
		import android.content.pm.PackageManager
		import android.content.pm.ResolveInfo
		import androidx.test.ext.junit.runners.AndroidJUnit4
		@@ -77,8 +78,8 @@ class SupervisionIntentProviderTest {
		fun getSettingsIntent_unresolvedIntent() {
		`when`(mockSupervisionManager.activeSupervisionAppPackage)
		.thenReturn(SUPERVISION_APP_PACKAGE)
		`when`(mockPackageManager.queryIntentActivitiesAsUser(any(), anyInt(), anyInt()))
		.thenReturn(emptyList())
		`when`(mockPackageManager.queryIntentActivitiesAsUser(any<Intent>(), anyInt(), anyInt()))
		.thenReturn(emptyList<ResolveInfo>())

		val intent = SupervisionIntentProvider.getSettingsIntent(context)

		@@ -89,7 +90,7 @@ class SupervisionIntentProviderTest {
		fun getSettingsIntent_resolvedIntent() {
		`when`(mockSupervisionManager.activeSupervisionAppPackage)
		.thenReturn(SUPERVISION_APP_PACKAGE)
		`when`(mockPackageManager.queryIntentActivitiesAsUser(any(), anyInt(), anyInt()))
		`when`(mockPackageManager.queryIntentActivitiesAsUser(any<Intent>(), anyInt(), anyInt()))
		.thenReturn(listOf(ResolveInfo()))

		val intent = SupervisionIntentProvider.getSettingsIntent(context)

packages/SettingsLib/tests/robotests/src/com/android/settingslib/supervision/SupervisionRestrictionsHelperTest.kt

0 → 100644

+178 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.settingslib.supervision

		import android.app.admin.DeviceAdminReceiver
		import android.app.supervision.SupervisionManager
		import android.content.Context
		import android.content.ContextWrapper
		import android.content.Intent
		import android.content.pm.ActivityInfo
		import android.content.pm.PackageManager
		import android.content.pm.ResolveInfo
		import android.content.pm.ServiceInfo
		import android.os.UserHandle
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.platform.app.InstrumentationRegistry
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentMatcher
		import org.mockito.ArgumentMatchers.any
		import org.mockito.ArgumentMatchers.anyInt
		import org.mockito.ArgumentMatchers.argThat
		import org.mockito.ArgumentMatchers.eq
		import org.mockito.Mock
		import org.mockito.Mockito.`when`
		import org.mockito.junit.MockitoJUnit
		import org.mockito.junit.MockitoRule

		/**
		* Unit tests for [SupervisionRestrictionsHelper].
		*
		* Run with `atest SupervisionRestrictionsHelperTest`.
		*/
		@RunWith(AndroidJUnit4::class)
		class SupervisionRestrictionsHelperTest {
		@get:Rule val mocks: MockitoRule = MockitoJUnit.rule()

		@Mock private lateinit var mockPackageManager: PackageManager

		@Mock private lateinit var mockSupervisionManager: SupervisionManager

		private lateinit var context: Context

		@Before
		fun setUp() {
		context =
		object : ContextWrapper(InstrumentationRegistry.getInstrumentation().context) {
		override fun getPackageManager() = mockPackageManager

		override fun getSystemService(name: String) =
		when (name) {
		Context.SUPERVISION_SERVICE -> mockSupervisionManager
		else -> super.getSystemService(name)
		}
		}
		}

		@Test
		fun createEnforcedAdmin_nullSupervisionPackage() {
		`when`(mockSupervisionManager.activeSupervisionAppPackage).thenReturn(null)

		val enforcedAdmin =
		SupervisionRestrictionsHelper.createEnforcedAdmin(context, RESTRICTION, USER_HANDLE)

		assertThat(enforcedAdmin).isNull()
		}

		@Test
		fun createEnforcedAdmin_supervisionAppService() {
		val resolveInfo =
		ResolveInfo().apply {
		serviceInfo =
		ServiceInfo().apply {
		packageName = SUPERVISION_APP_PACKAGE
		name = "service.class"
		}
		}

		`when`(mockSupervisionManager.activeSupervisionAppPackage)
		.thenReturn(SUPERVISION_APP_PACKAGE)
		`when`(
		mockPackageManager.queryIntentServicesAsUser(
		argThat(hasAction("android.app.action.BIND_SUPERVISION_APP_SERVICE")),
		anyInt(),
		eq(USER_ID),
		)
		)
		.thenReturn(listOf(resolveInfo))

		val enforcedAdmin =
		SupervisionRestrictionsHelper.createEnforcedAdmin(context, RESTRICTION, USER_HANDLE)

		assertThat(enforcedAdmin).isNotNull()
		assertThat(enforcedAdmin!!.component).isEqualTo(resolveInfo.serviceInfo.componentName)
		assertThat(enforcedAdmin.enforcedRestriction).isEqualTo(RESTRICTION)
		assertThat(enforcedAdmin.user).isEqualTo(USER_HANDLE)
		}

		@Test
		fun createEnforcedAdmin_profileOwnerReceiver() {
		val resolveInfo =
		ResolveInfo().apply {
		activityInfo =
		ActivityInfo().apply {
		packageName = SUPERVISION_APP_PACKAGE
		name = "service.class"
		}
		}

		`when`(mockSupervisionManager.activeSupervisionAppPackage)
		.thenReturn(SUPERVISION_APP_PACKAGE)
		`when`(mockPackageManager.queryIntentServicesAsUser(any<Intent>(), anyInt(), eq(USER_ID)))
		.thenReturn(emptyList<ResolveInfo>())
		`when`(
		mockPackageManager.queryBroadcastReceiversAsUser(
		argThat(hasAction(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED)),
		anyInt(),
		eq(USER_ID),
		)
		)
		.thenReturn(listOf(resolveInfo))

		val enforcedAdmin =
		SupervisionRestrictionsHelper.createEnforcedAdmin(context, RESTRICTION, USER_HANDLE)

		assertThat(enforcedAdmin).isNotNull()
		assertThat(enforcedAdmin!!.component).isEqualTo(resolveInfo.activityInfo.componentName)
		assertThat(enforcedAdmin.enforcedRestriction).isEqualTo(RESTRICTION)
		assertThat(enforcedAdmin.user).isEqualTo(USER_HANDLE)
		}

		@Test
		fun createEnforcedAdmin_noSupervisionComponent() {
		`when`(mockSupervisionManager.activeSupervisionAppPackage)
		.thenReturn(SUPERVISION_APP_PACKAGE)
		`when`(mockPackageManager.queryIntentServicesAsUser(any<Intent>(), anyInt(), anyInt()))
		.thenReturn(emptyList<ResolveInfo>())
		`when`(mockPackageManager.queryBroadcastReceiversAsUser(any<Intent>(), anyInt(), anyInt()))
		.thenReturn(emptyList<ResolveInfo>())

		val enforcedAdmin =
		SupervisionRestrictionsHelper.createEnforcedAdmin(context, RESTRICTION, USER_HANDLE)

		assertThat(enforcedAdmin).isNotNull()
		assertThat(enforcedAdmin!!.component).isNull()
		assertThat(enforcedAdmin.enforcedRestriction).isEqualTo(RESTRICTION)
		assertThat(enforcedAdmin.user).isEqualTo(USER_HANDLE)
		}

		private fun hasAction(action: String) =
		object : ArgumentMatcher<Intent> {
		override fun matches(intent: Intent?) = intent?.action == action
		}

		private companion object {
		const val SUPERVISION_APP_PACKAGE = "app.supervision"
		const val RESTRICTION = "restriction"
		val USER_HANDLE = UserHandle.CURRENT
		val USER_ID = USER_HANDLE.identifier
		}
		}