commit 939d5f876b6bb0bfe550c591e9f07be4ce44b9b1
author Stefan Andonian <andonian@google.com> Mon Sep 25 18:07:43 2023 +0000
committer Stefan Andonian <andonian@google.com> Wed Sep 27 21:42:45 2023 +0000
tree 10a8c11a2c48035455892e9ea6700a372d451cc0
parent 5ab9a57ec0af9d0f588206f240cc6f6bf9def74b

Make exception for TASKBAR_PINNING so it is boot aware.

Bug: 251502424
Test: No launcher exceptions where thrown when TASKBAR_PINNING feature
is enabled.

Change-Id: I7e71d37547af1951938c6d5e77325d5e8e6b9fbd

src/com/android/launcher3/LauncherPrefs.kt

diff --git a/src/com/android/launcher3/LauncherPrefs.kt b/src/com/android/launcher3/LauncherPrefs.kt
index 36d37c7..00bac1c 100644
--- a/src/com/android/launcher3/LauncherPrefs.kt
+++ b/src/com/android/launcher3/LauncherPrefs.kt
@@ -59,8 +59,12 @@
                 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