PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for Utils.isSystemPackage()

Browse Source 
And we also no longer need to load the PackageInfos with the deprecated
flag PackageManager.GET_SIGNATURES.

Bug: 235727273
Test: Manually with Settings App
Change-Id: Id80c40a309e91d4766582375d2c1e25a6f8cf441
This commit is contained in:
Chaohui Wang
2022-11-04 17:48:15 +08:00
parent d7194ad75d
commit dc46bc9077
9 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -352,7 +352,6 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName, mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.MATCH_DISABLED_COMPONENTS |
PackageManager.MATCH_ANY_USER | PackageManager.MATCH_ANY_USER |
PackageManager.GET_SIGNATURES |
PackageManager.GET_PERMISSIONS); PackageManager.GET_PERMISSIONS);
mPackageName = mAppEntry.info.packageName; mPackageName = mAppEntry.info.packageName;
@@ -394,7 +393,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
// We don't allow uninstalling DO/PO on *any* users if it's a system app, because // We don't allow uninstalling DO/PO on *any* users if it's a system app, because
// "uninstall" is actually "downgrade to the system version + disable", and "downgrade" // "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
// will clear data on all users. // will clear data on all users.
if (isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) { if (isSystemPackage(mActivity.getResources(), mPm, mPackageInfo.applicationInfo)) {
if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) { if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
enabled = false; enabled = false;
} }
@@ -563,7 +562,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
// by not allowing disabling of apps signed with the // by not allowing disabling of apps signed with the
// system cert and any launcher app in the system. // system cert and any launcher app in the system.
if (mHomePackages.contains(mAppEntry.info.packageName) if (mHomePackages.contains(mAppEntry.info.packageName)
|| isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) { || isSystemPackage(mActivity.getResources(), mPm, mPackageInfo.applicationInfo)) {
// Disable button for core system applications. // Disable button for core system applications.
mButtonsPref.setButton2Text(R.string.disable_text) mButtonsPref.setButton2Text(R.string.disable_text)
.setButton2Icon(R.drawable.ic_settings_disable); .setButton2Icon(R.drawable.ic_settings_disable);
@@ -582,8 +581,8 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
} }
@VisibleForTesting @VisibleForTesting
boolean isSystemPackage(Resources resources, PackageManager pm, PackageInfo packageInfo) { boolean isSystemPackage(Resources resources, PackageManager pm, ApplicationInfo app) {
return Utils.isSystemPackage(resources, pm, packageInfo); return Utils.isSystemPackage(resources, pm, app);
} }
private boolean isDisabledUntilUsed() { private boolean isDisabledUntilUsed() {

18
src/com/android/settings/spa/app/appinfo/AppButtons.kt
View File

@@ -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

5
src/com/android/settings/spa/app/appinfo/AppClearButton.kt
View File

@@ -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()

12
src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
View File

@@ -52,13 +52,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 = app, enabled = isDisableButtonEnabled(app))
} }
else -> enableButton() else -> enableButton()
@@ -68,9 +67,8 @@ class AppDisableButton(
/** /**
* Gets whether a package can be disabled. * Gets whether a package can be disabled.
*/ */
private fun isDisableButtonEnabled(packageInfo: PackageInfo): Boolean { private fun isDisableButtonEnabled(app: ApplicationInfo): Boolean {
val packageName = packageInfo.packageName val packageName = app.packageName
val app = packageInfo.applicationInfo
return when { return when {
packageName in applicationFeatureProvider.keepEnabledPackages -> false packageName in applicationFeatureProvider.keepEnabledPackages -> false
@@ -80,7 +78,7 @@ class AppDisableButton(
// Try to prevent the user from bricking their phone by not allowing disabling of apps // Try to prevent the user from bricking their phone by not allowing disabling of apps
// signed with the system certificate. // signed with the system certificate.
SettingsLibUtils.isSystemPackage(resources, packageManager, packageInfo) -> false SettingsLibUtils.isSystemPackage(resources, packageManager, app) -> false
// We don't allow disabling DO/PO on *any* users if it's a system app, because // 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" // "disabling" is actually "downgrade to the system version + disable", and "downgrade"

3
src/com/android/settings/spa/app/appinfo/AppForceStopButton.kt
View File

@@ -48,8 +48,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,

4
src/com/android/settings/spa/app/appinfo/AppInstallButton.kt
View File

@@ -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)

7
src/com/android/settings/spa/app/appinfo/AppLaunchButton.kt
View File

@@ -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(

4
src/com/android/settings/spa/app/appinfo/AppUninstallButton.kt
View File

@@ -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))
} }

4
src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
View File

@@ -147,9 +147,7 @@ class PackageInfoPresenter(
private fun getPackageInfo() = private fun getPackageInfo() =
PackageManagers.getPackageInfoAsUser( PackageManagers.getPackageInfoAsUser(
packageName = packageName, packageName = packageName,
flags = PackageManager.MATCH_DISABLED_COMPONENTS or flags = PackageManager.MATCH_DISABLED_COMPONENTS or PackageManager.GET_PERMISSIONS,
PackageManager.GET_SIGNATURES or
PackageManager.GET_PERMISSIONS,
userId = userId, userId = userId,
) )
} }