Merge "Make exception for TASKBAR_PINNING so it is boot aware." into main

This commit is contained in:
Stefan Andonian
2023-09-28 18:59:14 +00:00
committed by Android (Google) Code Review
+5 -1
View File
@@ -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