Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make stable enableability of AppPermissionPreference, HibernationSwitchPreference buttons when app is archived

Browse Source 
Test: n/a

Bug: 315770669
Change-Id: I0b4a1f8a2d3bbe9c6e8b59b5b1e16c606d26e8ed
This commit is contained in:
Mark Kim
2023-12-12 14:52:28 +00:00
parent 11df0d4c17
commit f1dd128c45
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,8 +55,12 @@ class AppPermissionSummaryLiveData(
override fun onActive() { override fun onActive() {
userPackageManager.addOnPermissionsChangeListener(onPermissionsChangedListener) userPackageManager.addOnPermissionsChangeListener(onPermissionsChangedListener)
if (app.isArchived) {
postValue(noPermissionRequestedState())
} else {
update() update()
} }
}
override fun onInactive() { override fun onInactive() {
userPackageManager.removeOnPermissionsChangeListener(onPermissionsChangedListener) userPackageManager.removeOnPermissionsChangeListener(onPermissionsChangedListener)

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

@@ -93,6 +93,10 @@ private class HibernationSwitchPresenter(context: Context, private val app: Appl
DeviceConfig.getBoolean(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED, true) DeviceConfig.getBoolean(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED, true)
val isEligibleFlow = flow { val isEligibleFlow = flow {
if (app.isArchived) {
emit(false)
return@flow
}
val eligibility = getEligibility() val eligibility = getEligibility()
emit( emit(
eligibility != HIBERNATION_ELIGIBILITY_EXEMPT_BY_SYSTEM && eligibility != HIBERNATION_ELIGIBILITY_EXEMPT_BY_SYSTEM &&