Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4869bf3f authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing workspaceLoaded check from loadDeepShortcuts() 

loadDeepShortcuts() is called after loadWorkspace() which already
clears the shortcutMap. So if loader runs twice, during the second run,
workspaceLoaded is true, but the shortcutMap had already been cleared
in loadWorkspace().

Bug: 38384071
Change-Id: I40f0faf88376617e56819aef02620488e528dfb2
parent 02aced97

src/com/android/launcher3/LauncherModel.java

+9 −11
Original line number Diff line number Diff line
@@ -1763,7 +1763,6 @@ public class LauncherModel extends BroadcastReceiver 
        }



        private void loadDeepShortcuts() {

            if (!mModelLoaded) {

            sBgDataModel.deepShortcutMap.clear();

            DeepShortcutManager shortcutManager = DeepShortcutManager.getInstance(mContext);

            mHasShortcutHostPermission = shortcutManager.hasHostPermission();
@@ -1778,7 +1777,6 @@ public class LauncherModel extends BroadcastReceiver 
            }

        }

    }

    }



    public void bindDeepShortcuts() {

        final MultiHashMap<ComponentKey, String> shortcutMapCopy =