summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-05-19 18:02:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-19 18:02:00 +0000
commitc6bfffb0783de32028066282064cc4f9f6d0aa4e (patch)
treebe8850666d0f03b8b2d8d47ead5b6dfd9e5ae19d /src
parentd5dbf617578506310e78b950b011dc3dbb5432ea (diff)
parent4869bf3f74d4dd97b81b3aed2f2f47bf9226681b (diff)
downloadandroid_packages_apps_Trebuchet-c6bfffb0783de32028066282064cc4f9f6d0aa4e.tar.gz
android_packages_apps_Trebuchet-c6bfffb0783de32028066282064cc4f9f6d0aa4e.tar.bz2
android_packages_apps_Trebuchet-c6bfffb0783de32028066282064cc4f9f6d0aa4e.zip
Removing workspaceLoaded check from loadDeepShortcuts()
am: 4869bf3f74 Change-Id: I1516a214df024f5e9b9387671cfadd3697384ede
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherModel.java20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index ca9f3120d..e75c217bc 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1777,17 +1777,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);
}
}
}