Removing all usage of LauncherProvider
Also fixing a race condition in model when an item update/delete task
gets queued and executed after the model has reloaded (making the old
data obsolete)
Bug: 277345535
Bug: 263079498
Test: Presubmit
Flag: N/A
Change-Id: Ibd4bdbb3eece05b38b73a22a4be5f368df3754f0
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4e066b0..f225f85 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -143,6 +143,8 @@
@NonNull
private final ModelDelegate mModelDelegate;
+ private int mLastLoadId = -1;
+
// Runnable to check if the shortcuts permission has changed.
@NonNull
private final Runnable mDataValidationCheck = new Runnable() {
@@ -553,6 +555,7 @@
if (mLoaderTask != task) {
throw new CancellationException("Loader already stopped");
}
+ mLastLoadId++;
mTask = task;
mIsLoaderTaskRunning = true;
mModelLoaded = false;
@@ -722,4 +725,12 @@
return mCallbacksList.toArray(new Callbacks[mCallbacksList.size()]);
}
}
+
+ /**
+ * Returns the ID for the last model load. If the load ID doesn't match for a transaction, the
+ * transaction should be ignored.
+ */
+ public int getLastLoadId() {
+ return mLastLoadId;
+ }
}