Merge "Only check dbFile to decide if grid migration is needed" into tm-qpr-dev am: bd8111a049

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18929060 Change-Id: If1f486698b05e167eb3cf78bbcd170c5b3faf84a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 20:23:50 +00:00
parent b683d685d7 bd8111a049
commit ea4cd21275
1 changed files with 7 additions and 4 deletions
@@ -134,10 +134,13 @@ public class DeviceGridState implements Comparable<DeviceGridState> {
     * DeviceGridState without migration, or false otherwise.
     */
    public boolean isCompatible(DeviceGridState other) {
-        if (this == other) return true;
-        if (other == null) return false;
-        return mNumHotseat == other.mNumHotseat
-                && Objects.equals(mGridSizeString, other.mGridSizeString);
+        if (this == other) {
+            return true;
+        }
+        if (other == null) {
+            return false;
+        }
+        return Objects.equals(mDbFile, other.mDbFile);
    }

    public Integer getColumns() {