commit 5c61d17f0ff67440ce9fb578043a4507b537aa0c
author Adam Cohen <adamcohen@google.com> Fri Apr 04 01:52:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 04 01:52:27 2014 +0000
tree 2300610a482a13dab60f47797f6e279fda5e53e3
parent dc1f5c4dcb39146320a692606a7371d130afbfe7
parent 8f006edba228622422088a358aafee069e1d9cfb

am 8f006edb: Prevent exception in production when icons collide during bind

* commit '8f006edba228622422088a358aafee069e1d9cfb':
  Prevent exception in production when icons collide during bind

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5bdd7eb3..6474d26 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3982,7 +3982,15 @@
                     if (item.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
                         CellLayout cl = mWorkspace.getScreenWithId(item.screenId);
                         if (cl != null && cl.isOccupied(item.cellX, item.cellY)) {
-                            throw new RuntimeException("OCCUPIED");
+                            View v = cl.getChildAt(item.cellX, item.cellY);
+                            Object tag = v.getTag();
+                            String desc = "Collision while binding workspace item: " + item
+                                    + ". Collides with " + tag;
+                            if (LauncherAppState.isDogfoodBuild()) {
+                                throw (new RuntimeException(desc));
+                            } else {
+                                Log.d(TAG, desc);
+                            }
                         }
                     }