diff options
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f09f20b2a..170aa5f1c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -5904,7 +5904,7 @@ public class Launcher extends Activity mGrid.layout(Launcher.this); // Synchronized reload - mModel.stopLoader(); //make sure the loader isn't running + mModel.resetLoadedState(true, true); mModel.startLoader(true, page); mWorkspace.updateCustomContentVisibility(); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 520e81bbd..2914d2324 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1537,7 +1537,11 @@ public class LauncherModel extends BroadcastReceiver } public void stopLoader() { - resetLoadedState(true, true); + synchronized (mLock) { + if (mLoaderTask != null) { + mLoaderTask.stopLocked(); + } + } } /** Loads the workspace screens db into a map of Rank -> ScreenId */ |