Merge "Make exception for TASKBAR_PINNING so it is boot aware." into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
dfc628dabb
@@ -59,8 +59,12 @@ class LauncherPrefs(private val encryptedContext: Context) {
|
||||
IS_STARTUP_DATA_MIGRATED.defaultValue
|
||||
)
|
||||
|
||||
// TODO: Remove `item == TASKBAR_PINNING` once isBootAwareStartupDataEnabled is always true
|
||||
private fun chooseSharedPreferences(item: Item): SharedPreferences =
|
||||
if (isBootAwareStartupDataEnabled && item.isBootAware && isStartupDataMigrated)
|
||||
if (
|
||||
(isBootAwareStartupDataEnabled && item.isBootAware && isStartupDataMigrated) ||
|
||||
item == TASKBAR_PINNING
|
||||
)
|
||||
bootAwarePrefs
|
||||
else item.encryptedPrefs
|
||||
|
||||
|
||||
Reference in New Issue
Block a user