diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-05-17 12:05:46 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-05-17 12:07:39 -0700 |
| commit | 4869bf3f74d4dd97b81b3aed2f2f47bf9226681b (patch) | |
| tree | 59ab1e96e7ac11f7e349d8b1147d87ef3f8f5ab6 /src | |
| parent | 02aced978285c8a78eb98ee22130cf43017a4fa6 (diff) | |
| download | android_packages_apps_Trebuchet-4869bf3f74d4dd97b81b3aed2f2f47bf9226681b.tar.gz android_packages_apps_Trebuchet-4869bf3f74d4dd97b81b3aed2f2f47bf9226681b.tar.bz2 android_packages_apps_Trebuchet-4869bf3f74d4dd97b81b3aed2f2f47bf9226681b.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index e68e637c5..f881b380a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1763,17 +1763,15 @@ public class LauncherModel extends BroadcastReceiver } private void loadDeepShortcuts() { - if (!mModelLoaded) { - sBgDataModel.deepShortcutMap.clear(); - DeepShortcutManager shortcutManager = DeepShortcutManager.getInstance(mContext); - mHasShortcutHostPermission = shortcutManager.hasHostPermission(); - if (mHasShortcutHostPermission) { - for (UserHandle user : mUserManager.getUserProfiles()) { - if (mUserManager.isUserUnlocked(user)) { - List<ShortcutInfoCompat> shortcuts = - shortcutManager.queryForAllShortcuts(user); - sBgDataModel.updateDeepShortcutMap(null, user, shortcuts); - } + sBgDataModel.deepShortcutMap.clear(); + DeepShortcutManager shortcutManager = DeepShortcutManager.getInstance(mContext); + mHasShortcutHostPermission = shortcutManager.hasHostPermission(); + if (mHasShortcutHostPermission) { + for (UserHandle user : mUserManager.getUserProfiles()) { + if (mUserManager.isUserUnlocked(user)) { + List<ShortcutInfoCompat> shortcuts = + shortcutManager.queryForAllShortcuts(user); + sBgDataModel.updateDeepShortcutMap(null, user, shortcuts); } } } |