Use isEssentialPackage instead of isSystemPackage
This is faster, and we also no longer need to load the PackageInfos with the deprecated flag PackageManager.GET_SIGNATURES. Bug: 235727273 Test: Unit test Test: Manually with Settings App Change-Id: Ia09ed24ca2622a162ce6008fcd29a930812dbcc2
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package com.android.settings.spa.app.appinfo
|
package com.android.settings.spa.app.appinfo
|
||||||
|
|
||||||
import android.content.pm.PackageInfo
|
import android.content.pm.ApplicationInfo
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.compose.runtime.collectAsState
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
@@ -58,17 +58,17 @@ private class AppButtonsPresenter(private val packageInfoPresenter: PackageInfoP
|
|||||||
@Composable
|
@Composable
|
||||||
fun rememberActionsButtons() = remember {
|
fun rememberActionsButtons() = remember {
|
||||||
packageInfoPresenter.flow.map { packageInfo ->
|
packageInfoPresenter.flow.map { packageInfo ->
|
||||||
if (packageInfo != null) getActionButtons(packageInfo) else emptyList()
|
if (packageInfo != null) getActionButtons(packageInfo.applicationInfo) else emptyList()
|
||||||
}
|
}
|
||||||
}.collectAsState(initial = emptyList())
|
}.collectAsState(initial = emptyList())
|
||||||
|
|
||||||
private fun getActionButtons(packageInfo: PackageInfo): List<ActionButton> = listOfNotNull(
|
private fun getActionButtons(app: ApplicationInfo): List<ActionButton> = listOfNotNull(
|
||||||
appLaunchButton.getActionButton(packageInfo),
|
appLaunchButton.getActionButton(app),
|
||||||
appInstallButton.getActionButton(packageInfo),
|
appInstallButton.getActionButton(app),
|
||||||
appDisableButton.getActionButton(packageInfo),
|
appDisableButton.getActionButton(app),
|
||||||
appUninstallButton.getActionButton(packageInfo),
|
appUninstallButton.getActionButton(app),
|
||||||
appClearButton.getActionButton(packageInfo),
|
appClearButton.getActionButton(app),
|
||||||
appForceStopButton.getActionButton(packageInfo),
|
appForceStopButton.getActionButton(app),
|
||||||
)
|
)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package com.android.settings.spa.app.appinfo
|
package com.android.settings.spa.app.appinfo
|
||||||
|
|
||||||
import android.content.pm.PackageInfo
|
import android.content.pm.ApplicationInfo
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.outlined.Delete
|
import androidx.compose.material.icons.outlined.Delete
|
||||||
import androidx.compose.material3.AlertDialog
|
import androidx.compose.material3.AlertDialog
|
||||||
@@ -37,8 +37,7 @@ class AppClearButton(
|
|||||||
|
|
||||||
private var openConfirmDialog by mutableStateOf(false)
|
private var openConfirmDialog by mutableStateOf(false)
|
||||||
|
|
||||||
fun getActionButton(packageInfo: PackageInfo): ActionButton? {
|
fun getActionButton(app: ApplicationInfo): ActionButton? {
|
||||||
val app = packageInfo.applicationInfo
|
|
||||||
if (!app.isInstantApp) return null
|
if (!app.isInstantApp) return null
|
||||||
|
|
||||||
return clearButton()
|
return clearButton()
|
||||||
|
@@ -17,7 +17,6 @@
|
|||||||
package com.android.settings.spa.app.appinfo
|
package com.android.settings.spa.app.appinfo
|
||||||
|
|
||||||
import android.content.pm.ApplicationInfo
|
import android.content.pm.ApplicationInfo
|
||||||
import android.content.pm.PackageInfo
|
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.outlined.ArrowCircleDown
|
import androidx.compose.material.icons.outlined.ArrowCircleDown
|
||||||
import androidx.compose.material.icons.outlined.HideSource
|
import androidx.compose.material.icons.outlined.HideSource
|
||||||
@@ -52,13 +51,12 @@ class AppDisableButton(
|
|||||||
|
|
||||||
private var openConfirmDialog by mutableStateOf(false)
|
private var openConfirmDialog by mutableStateOf(false)
|
||||||
|
|
||||||
fun getActionButton(packageInfo: PackageInfo): ActionButton? {
|
fun getActionButton(app: ApplicationInfo): ActionButton? {
|
||||||
val app = packageInfo.applicationInfo
|
|
||||||
if (!app.isSystemApp) return null
|
if (!app.isSystemApp) return null
|
||||||
|
|
||||||
return when {
|
return when {
|
||||||
app.enabled && !app.isDisabledUntilUsed -> {
|
app.enabled && !app.isDisabledUntilUsed -> {
|
||||||
disableButton(app = app, enabled = isDisableButtonEnabled(packageInfo))
|
disableButton(app)
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> enableButton()
|
else -> enableButton()
|
||||||
@@ -68,38 +66,36 @@ class AppDisableButton(
|
|||||||
/**
|
/**
|
||||||
* Gets whether a package can be disabled.
|
* Gets whether a package can be disabled.
|
||||||
*/
|
*/
|
||||||
private fun isDisableButtonEnabled(packageInfo: PackageInfo): Boolean {
|
private fun ApplicationInfo.canBeDisabled(): Boolean = when {
|
||||||
val packageName = packageInfo.packageName
|
// Try to prevent the user from bricking their phone by not allowing disabling of apps
|
||||||
val app = packageInfo.applicationInfo
|
// signed with the system certificate.
|
||||||
return when {
|
isSignedWithPlatformKey -> false
|
||||||
packageName in applicationFeatureProvider.keepEnabledPackages -> false
|
|
||||||
|
|
||||||
// Home launcher apps need special handling. In system ones we don't risk downgrading
|
// system/vendor resource overlays can never be disabled.
|
||||||
// because that can interfere with home-key resolution.
|
isResourceOverlay -> false
|
||||||
packageName in appButtonRepository.getHomePackageInfo().homePackages -> false
|
|
||||||
|
|
||||||
// Try to prevent the user from bricking their phone by not allowing disabling of apps
|
packageName in applicationFeatureProvider.keepEnabledPackages -> false
|
||||||
// signed with the system certificate.
|
|
||||||
SettingsLibUtils.isSystemPackage(resources, packageManager, packageInfo) -> false
|
|
||||||
|
|
||||||
// We don't allow disabling DO/PO on *any* users if it's a system app, because
|
// Home launcher apps need special handling. In system ones we don't risk downgrading
|
||||||
// "disabling" is actually "downgrade to the system version + disable", and "downgrade"
|
// because that can interfere with home-key resolution.
|
||||||
// will clear data on all users.
|
packageName in appButtonRepository.getHomePackageInfo().homePackages -> false
|
||||||
Utils.isProfileOrDeviceOwner(userManager, devicePolicyManager, packageName) -> false
|
|
||||||
|
|
||||||
appButtonRepository.isDisallowControl(app) -> false
|
SettingsLibUtils.isEssentialPackage(resources, packageManager, packageName) -> false
|
||||||
|
|
||||||
// system/vendor resource overlays can never be disabled.
|
// We don't allow disabling DO/PO on *any* users if it's a system app, because
|
||||||
app.isResourceOverlay -> false
|
// "disabling" is actually "downgrade to the system version + disable", and "downgrade"
|
||||||
|
// will clear data on all users.
|
||||||
|
Utils.isProfileOrDeviceOwner(userManager, devicePolicyManager, packageName) -> false
|
||||||
|
|
||||||
else -> true
|
appButtonRepository.isDisallowControl(this) -> false
|
||||||
}
|
|
||||||
|
else -> true
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun disableButton(app: ApplicationInfo, enabled: Boolean) = ActionButton(
|
private fun disableButton(app: ApplicationInfo) = ActionButton(
|
||||||
text = context.getString(R.string.disable_text),
|
text = context.getString(R.string.disable_text),
|
||||||
imageVector = Icons.Outlined.HideSource,
|
imageVector = Icons.Outlined.HideSource,
|
||||||
enabled = enabled,
|
enabled = app.canBeDisabled(),
|
||||||
) {
|
) {
|
||||||
// Currently we apply the same device policy for both the uninstallation and disable button.
|
// Currently we apply the same device policy for both the uninstallation and disable button.
|
||||||
if (!appButtonRepository.isUninstallBlockedByAdmin(app)) {
|
if (!appButtonRepository.isUninstallBlockedByAdmin(app)) {
|
||||||
|
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo
|
|||||||
|
|
||||||
import android.app.settings.SettingsEnums
|
import android.app.settings.SettingsEnums
|
||||||
import android.content.pm.ApplicationInfo
|
import android.content.pm.ApplicationInfo
|
||||||
import android.content.pm.PackageInfo
|
|
||||||
import android.os.UserManager
|
import android.os.UserManager
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.outlined.WarningAmber
|
import androidx.compose.material.icons.outlined.WarningAmber
|
||||||
@@ -48,8 +47,7 @@ class AppForceStopButton(
|
|||||||
|
|
||||||
private var openConfirmDialog by mutableStateOf(false)
|
private var openConfirmDialog by mutableStateOf(false)
|
||||||
|
|
||||||
fun getActionButton(packageInfo: PackageInfo): ActionButton {
|
fun getActionButton(app: ApplicationInfo): ActionButton {
|
||||||
val app = packageInfo.applicationInfo
|
|
||||||
return ActionButton(
|
return ActionButton(
|
||||||
text = context.getString(R.string.force_stop),
|
text = context.getString(R.string.force_stop),
|
||||||
imageVector = Icons.Outlined.WarningAmber,
|
imageVector = Icons.Outlined.WarningAmber,
|
||||||
|
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo
|
|||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.pm.ApplicationInfo
|
import android.content.pm.ApplicationInfo
|
||||||
import android.content.pm.PackageInfo
|
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.outlined.FileDownload
|
import androidx.compose.material.icons.outlined.FileDownload
|
||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
@@ -29,8 +28,7 @@ import com.android.settingslib.spaprivileged.model.app.userHandle
|
|||||||
class AppInstallButton(private val packageInfoPresenter: PackageInfoPresenter) {
|
class AppInstallButton(private val packageInfoPresenter: PackageInfoPresenter) {
|
||||||
private val context = packageInfoPresenter.context
|
private val context = packageInfoPresenter.context
|
||||||
|
|
||||||
fun getActionButton(packageInfo: PackageInfo): ActionButton? {
|
fun getActionButton(app: ApplicationInfo): ActionButton? {
|
||||||
val app = packageInfo.applicationInfo
|
|
||||||
if (!app.isInstantApp) return null
|
if (!app.isInstantApp) return null
|
||||||
|
|
||||||
return AppStoreUtil.getAppStoreLink(packageInfoPresenter.userContext, app.packageName)
|
return AppStoreUtil.getAppStoreLink(packageInfoPresenter.userContext, app.packageName)
|
||||||
|
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo
|
|||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.pm.ApplicationInfo
|
import android.content.pm.ApplicationInfo
|
||||||
import android.content.pm.PackageInfo
|
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.outlined.Launch
|
import androidx.compose.material.icons.outlined.Launch
|
||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
@@ -29,9 +28,9 @@ class AppLaunchButton(packageInfoPresenter: PackageInfoPresenter) {
|
|||||||
private val context = packageInfoPresenter.context
|
private val context = packageInfoPresenter.context
|
||||||
private val userPackageManager = packageInfoPresenter.userPackageManager
|
private val userPackageManager = packageInfoPresenter.userPackageManager
|
||||||
|
|
||||||
fun getActionButton(packageInfo: PackageInfo): ActionButton? =
|
fun getActionButton(app: ApplicationInfo): ActionButton? =
|
||||||
userPackageManager.getLaunchIntentForPackage(packageInfo.packageName)?.let { intent ->
|
userPackageManager.getLaunchIntentForPackage(app.packageName)?.let { intent ->
|
||||||
launchButton(intent, packageInfo.applicationInfo)
|
launchButton(intent, app)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun launchButton(intent: Intent, app: ApplicationInfo) = ActionButton(
|
private fun launchButton(intent: Intent, app: ApplicationInfo) = ActionButton(
|
||||||
|
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo
|
|||||||
|
|
||||||
import android.content.om.OverlayManager
|
import android.content.om.OverlayManager
|
||||||
import android.content.pm.ApplicationInfo
|
import android.content.pm.ApplicationInfo
|
||||||
import android.content.pm.PackageInfo
|
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.outlined.Delete
|
import androidx.compose.material.icons.outlined.Delete
|
||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
@@ -32,8 +31,7 @@ class AppUninstallButton(private val packageInfoPresenter: PackageInfoPresenter)
|
|||||||
private val appButtonRepository = AppButtonRepository(context)
|
private val appButtonRepository = AppButtonRepository(context)
|
||||||
private val overlayManager = context.getSystemService(OverlayManager::class.java)!!
|
private val overlayManager = context.getSystemService(OverlayManager::class.java)!!
|
||||||
|
|
||||||
fun getActionButton(packageInfo: PackageInfo): ActionButton? {
|
fun getActionButton(app: ApplicationInfo): ActionButton? {
|
||||||
val app = packageInfo.applicationInfo
|
|
||||||
if (app.isSystemApp || app.isInstantApp) return null
|
if (app.isSystemApp || app.isInstantApp) return null
|
||||||
return uninstallButton(app = app, enabled = isUninstallButtonEnabled(app))
|
return uninstallButton(app = app, enabled = isUninstallButtonEnabled(app))
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,168 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 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.settings.spa.app.appinfo
|
||||||
|
|
||||||
|
import android.app.admin.DevicePolicyManager
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.pm.ApplicationInfo
|
||||||
|
import android.content.pm.PackageManager
|
||||||
|
import android.os.UserManager
|
||||||
|
import androidx.test.core.app.ApplicationProvider
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||||
|
import com.android.dx.mockito.inline.extended.ExtendedMockito
|
||||||
|
import com.android.settings.Utils
|
||||||
|
import com.android.settings.testutils.FakeFeatureFactory
|
||||||
|
import com.android.settingslib.spaprivileged.framework.common.devicePolicyManager
|
||||||
|
import com.android.settingslib.spaprivileged.framework.common.userManager
|
||||||
|
import com.google.common.truth.Truth.assertThat
|
||||||
|
import org.junit.After
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Test
|
||||||
|
import org.junit.runner.RunWith
|
||||||
|
import org.mockito.Mock
|
||||||
|
import org.mockito.MockitoSession
|
||||||
|
import org.mockito.Spy
|
||||||
|
import org.mockito.quality.Strictness
|
||||||
|
import com.android.settingslib.Utils as SettingsLibUtils
|
||||||
|
import org.mockito.Mockito.`when` as whenever
|
||||||
|
|
||||||
|
@RunWith(AndroidJUnit4::class)
|
||||||
|
class AppDisableButtonTest {
|
||||||
|
|
||||||
|
private lateinit var mockSession: MockitoSession
|
||||||
|
|
||||||
|
@Spy
|
||||||
|
private val context: Context = ApplicationProvider.getApplicationContext()
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var packageInfoPresenter: PackageInfoPresenter
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var packageManager: PackageManager
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var userManager: UserManager
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private lateinit var devicePolicyManager: DevicePolicyManager
|
||||||
|
|
||||||
|
private val fakeFeatureFactory = FakeFeatureFactory()
|
||||||
|
private val appFeatureProvider = fakeFeatureFactory.applicationFeatureProvider
|
||||||
|
|
||||||
|
private lateinit var appDisableButton: AppDisableButton
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setUp() {
|
||||||
|
mockSession = ExtendedMockito.mockitoSession()
|
||||||
|
.initMocks(this)
|
||||||
|
.mockStatic(SettingsLibUtils::class.java)
|
||||||
|
.mockStatic(Utils::class.java)
|
||||||
|
.strictness(Strictness.LENIENT)
|
||||||
|
.startMocking()
|
||||||
|
whenever(packageInfoPresenter.context).thenReturn(context)
|
||||||
|
whenever(context.packageManager).thenReturn(packageManager)
|
||||||
|
whenever(context.userManager).thenReturn(userManager)
|
||||||
|
whenever(context.devicePolicyManager).thenReturn(devicePolicyManager)
|
||||||
|
whenever(appFeatureProvider.keepEnabledPackages).thenReturn(emptySet())
|
||||||
|
whenever(
|
||||||
|
SettingsLibUtils.isEssentialPackage(context.resources, packageManager, PACKAGE_NAME)
|
||||||
|
).thenReturn(false)
|
||||||
|
whenever(Utils.isProfileOrDeviceOwner(userManager, devicePolicyManager, PACKAGE_NAME))
|
||||||
|
.thenReturn(false)
|
||||||
|
appDisableButton = AppDisableButton(packageInfoPresenter)
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
fun tearDown() {
|
||||||
|
mockSession.finishMocking()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getActionButton_signedWithPlatformKey_cannotDisable() {
|
||||||
|
val app = enabledSystemApp {
|
||||||
|
privateFlags = privateFlags or ApplicationInfo.PRIVATE_FLAG_SIGNED_WITH_PLATFORM_KEY
|
||||||
|
}
|
||||||
|
|
||||||
|
val actionButton = appDisableButton.getActionButton(app)!!
|
||||||
|
|
||||||
|
assertThat(actionButton.enabled).isFalse()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getActionButton_isResourceOverlay_cannotDisable() {
|
||||||
|
val app = enabledSystemApp {
|
||||||
|
privateFlags = privateFlags or ApplicationInfo.PRIVATE_FLAG_IS_RESOURCE_OVERLAY
|
||||||
|
}
|
||||||
|
|
||||||
|
val actionButton = appDisableButton.getActionButton(app)!!
|
||||||
|
|
||||||
|
assertThat(actionButton.enabled).isFalse()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getActionButton_isKeepEnabledPackages_cannotDisable() {
|
||||||
|
whenever(appFeatureProvider.keepEnabledPackages).thenReturn(setOf(PACKAGE_NAME))
|
||||||
|
val app = enabledSystemApp()
|
||||||
|
|
||||||
|
val actionButton = appDisableButton.getActionButton(app)!!
|
||||||
|
|
||||||
|
assertThat(actionButton.enabled).isFalse()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getActionButton_isEssentialPackage_cannotDisable() {
|
||||||
|
whenever(
|
||||||
|
SettingsLibUtils.isEssentialPackage(context.resources, packageManager, PACKAGE_NAME)
|
||||||
|
).thenReturn(true)
|
||||||
|
val app = enabledSystemApp()
|
||||||
|
|
||||||
|
val actionButton = appDisableButton.getActionButton(app)!!
|
||||||
|
|
||||||
|
assertThat(actionButton.enabled).isFalse()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getActionButton_isProfileOrDeviceOwner_cannotDisable() {
|
||||||
|
whenever(Utils.isProfileOrDeviceOwner(userManager, devicePolicyManager, PACKAGE_NAME))
|
||||||
|
.thenReturn(true)
|
||||||
|
val app = enabledSystemApp()
|
||||||
|
|
||||||
|
val actionButton = appDisableButton.getActionButton(app)!!
|
||||||
|
|
||||||
|
assertThat(actionButton.enabled).isFalse()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getActionButton_regularEnabledSystemApp_canDisable() {
|
||||||
|
val app = enabledSystemApp()
|
||||||
|
|
||||||
|
val actionButton = appDisableButton.getActionButton(app)!!
|
||||||
|
|
||||||
|
assertThat(actionButton.enabled).isTrue()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun enabledSystemApp(builder: ApplicationInfo.() -> Unit = {}) =
|
||||||
|
ApplicationInfo().apply {
|
||||||
|
packageName = PACKAGE_NAME
|
||||||
|
enabled = true
|
||||||
|
flags = ApplicationInfo.FLAG_SYSTEM
|
||||||
|
}.apply(builder)
|
||||||
|
|
||||||
|
private companion object {
|
||||||
|
const val PACKAGE_NAME = "package.name"
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user