From 1ada2c53ea26767aec015bca92333110dece23f6 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Mon, 12 May 2025 15:49:02 -0700 Subject: [PATCH] launcher3: Avoid mutating model on collisions in Launcher3. Collisions should be handled prior to binding in the ui layer. The following change adds extra logging to help identify cases where this might occur. Bug: 417021465 Flag: EXEMPT Bug fix Test: manual Change-Id: I5549c94fe81eb13088f8c56a5ff797d46d4bedb2 --- src/com/android/launcher3/Launcher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 60c49eb305..9e829e316f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2240,7 +2240,8 @@ public class Launcher extends StatefulActivity if (FeatureFlags.IS_STUDIO_BUILD) { throw (new RuntimeException(desc)); } else { - getModelWriter().deleteItemFromDatabase(item, desc); + // b/417021465 - Avoid mutating the model in the UI layer. + Log.e(TAG, desc, new Exception()); continue; } }