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
2022-11-18 13:44:44 +08:00
parent 47c0ee6b38
commit 1b763b188d
8 changed files with 207 additions and 51 deletions
--- a/src/com/android/settings/spa/app/appinfo/AppButtons.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppButtons.kt
@@ -16,7 +16,7 @@

 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.collectAsState
 import androidx.compose.runtime.remember
@@ -58,17 +58,17 @@ private class AppButtonsPresenter(private val packageInfoPresenter: PackageInfoP
    @Composable
    fun rememberActionsButtons() = remember {
        packageInfoPresenter.flow.map { packageInfo ->
-            if (packageInfo != null) getActionButtons(packageInfo) else emptyList()
+            if (packageInfo != null) getActionButtons(packageInfo.applicationInfo) else emptyList()
        }
    }.collectAsState(initial = emptyList())

-    private fun getActionButtons(packageInfo: PackageInfo): List<ActionButton> = listOfNotNull(
-        appLaunchButton.getActionButton(packageInfo),
-        appInstallButton.getActionButton(packageInfo),
-        appDisableButton.getActionButton(packageInfo),
-        appUninstallButton.getActionButton(packageInfo),
-        appClearButton.getActionButton(packageInfo),
-        appForceStopButton.getActionButton(packageInfo),
+    private fun getActionButtons(app: ApplicationInfo): List<ActionButton> = listOfNotNull(
+        appLaunchButton.getActionButton(app),
+        appInstallButton.getActionButton(app),
+        appDisableButton.getActionButton(app),
+        appUninstallButton.getActionButton(app),
+        appClearButton.getActionButton(app),
+        appForceStopButton.getActionButton(app),
    )

    @Composable
--- a/src/com/android/settings/spa/app/appinfo/AppClearButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppClearButton.kt
@@ -16,7 +16,7 @@

 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.outlined.Delete
 import androidx.compose.material3.AlertDialog
@@ -37,8 +37,7 @@ class AppClearButton(

    private var openConfirmDialog by mutableStateOf(false)

-    fun getActionButton(packageInfo: PackageInfo): ActionButton? {
-        val app = packageInfo.applicationInfo
+    fun getActionButton(app: ApplicationInfo): ActionButton? {
        if (!app.isInstantApp) return null

        return clearButton()
--- a/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
@@ -17,7 +17,6 @@
 package com.android.settings.spa.app.appinfo

 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowCircleDown
 import androidx.compose.material.icons.outlined.HideSource
@@ -52,13 +51,12 @@ class AppDisableButton(

    private var openConfirmDialog by mutableStateOf(false)

-    fun getActionButton(packageInfo: PackageInfo): ActionButton? {
-        val app = packageInfo.applicationInfo
+    fun getActionButton(app: ApplicationInfo): ActionButton? {
        if (!app.isSystemApp) return null

        return when {
            app.enabled && !app.isDisabledUntilUsed -> {
-                disableButton(app = app, enabled = isDisableButtonEnabled(packageInfo))
+                disableButton(app)
            }

            else -> enableButton()
@@ -68,38 +66,36 @@ class AppDisableButton(
    /**
     * Gets whether a package can be disabled.
     */
-    private fun isDisableButtonEnabled(packageInfo: PackageInfo): Boolean {
-        val packageName = packageInfo.packageName
-        val app = packageInfo.applicationInfo
-        return when {
-            packageName in applicationFeatureProvider.keepEnabledPackages -> false
+    private fun ApplicationInfo.canBeDisabled(): Boolean = when {
+        // Try to prevent the user from bricking their phone by not allowing disabling of apps
+        // signed with the system certificate.
+        isSignedWithPlatformKey -> false

-            // Home launcher apps need special handling. In system ones we don't risk downgrading
-            // because that can interfere with home-key resolution.
-            packageName in appButtonRepository.getHomePackageInfo().homePackages -> false
+        // system/vendor resource overlays can never be disabled.
+        isResourceOverlay -> false

-            // Try to prevent the user from bricking their phone by not allowing disabling of apps
-            // signed with the system certificate.
-            SettingsLibUtils.isSystemPackage(resources, packageManager, packageInfo) -> false
+        packageName in applicationFeatureProvider.keepEnabledPackages -> false

-            // We don't allow disabling DO/PO on *any* users if it's a system app, because
-            // "disabling" is actually "downgrade to the system version + disable", and "downgrade"
-            // will clear data on all users.
-            Utils.isProfileOrDeviceOwner(userManager, devicePolicyManager, packageName) -> false
+        // Home launcher apps need special handling. In system ones we don't risk downgrading
+        // because that can interfere with home-key resolution.
+        packageName in appButtonRepository.getHomePackageInfo().homePackages -> false

-            appButtonRepository.isDisallowControl(app) -> false
+        SettingsLibUtils.isEssentialPackage(resources, packageManager, packageName) -> false

-            // system/vendor resource overlays can never be disabled.
-            app.isResourceOverlay -> false
+        // We don't allow disabling DO/PO on *any* users if it's a system app, because
+        // "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),
        imageVector = Icons.Outlined.HideSource,
-        enabled = enabled,
+        enabled = app.canBeDisabled(),
    ) {
        // Currently we apply the same device policy for both the uninstallation and disable button.
        if (!appButtonRepository.isUninstallBlockedByAdmin(app)) {
--- a/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo

 import android.app.settings.SettingsEnums
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
 import android.os.UserManager
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.WarningAmber
@@ -48,8 +47,7 @@ class AppForceStopButton(

    private var openConfirmDialog by mutableStateOf(false)

-    fun getActionButton(packageInfo: PackageInfo): ActionButton {
-        val app = packageInfo.applicationInfo
+    fun getActionButton(app: ApplicationInfo): ActionButton {
        return ActionButton(
            text = context.getString(R.string.force_stop),
            imageVector = Icons.Outlined.WarningAmber,
--- a/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo

 import android.content.Intent
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.FileDownload
 import com.android.settings.R
@@ -29,8 +28,7 @@ import com.android.settingslib.spaprivileged.model.app.userHandle
 class AppInstallButton(private val packageInfoPresenter: PackageInfoPresenter) {
    private val context = packageInfoPresenter.context

-    fun getActionButton(packageInfo: PackageInfo): ActionButton? {
-        val app = packageInfo.applicationInfo
+    fun getActionButton(app: ApplicationInfo): ActionButton? {
        if (!app.isInstantApp) return null

        return AppStoreUtil.getAppStoreLink(packageInfoPresenter.userContext, app.packageName)
--- a/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo

 import android.content.Intent
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Launch
 import com.android.settings.R
@@ -29,9 +28,9 @@ class AppLaunchButton(packageInfoPresenter: PackageInfoPresenter) {
    private val context = packageInfoPresenter.context
    private val userPackageManager = packageInfoPresenter.userPackageManager

-    fun getActionButton(packageInfo: PackageInfo): ActionButton? =
-        userPackageManager.getLaunchIntentForPackage(packageInfo.packageName)?.let { intent ->
-            launchButton(intent, packageInfo.applicationInfo)
+    fun getActionButton(app: ApplicationInfo): ActionButton? =
+        userPackageManager.getLaunchIntentForPackage(app.packageName)?.let { intent ->
+            launchButton(intent, app)
        }

    private fun launchButton(intent: Intent, app: ApplicationInfo) = ActionButton(
--- a/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
@@ -18,7 +18,6 @@ package com.android.settings.spa.app.appinfo

 import android.content.om.OverlayManager
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Delete
 import com.android.settings.R
@@ -32,8 +31,7 @@ class AppUninstallButton(private val packageInfoPresenter: PackageInfoPresenter)
    private val appButtonRepository = AppButtonRepository(context)
    private val overlayManager = context.getSystemService(OverlayManager::class.java)!!

-    fun getActionButton(packageInfo: PackageInfo): ActionButton? {
-        val app = packageInfo.applicationInfo
+    fun getActionButton(app: ApplicationInfo): ActionButton? {
        if (app.isSystemApp || app.isInstantApp) return null
        return uninstallButton(app = app, enabled = isUninstallButtonEnabled(app))
    }