commit 5339119b9ef4d283b868abc41283ef2671bfebc8
author Michael Jurka <mikejurka@google.com> Fri Nov 08 08:34:15 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 08 08:34:15 2013 -0800
tree 532fdee2fa3cd572fe05ff8cd0c8321360bab1a0
parent 6f372bb723a87bb6c292067a848e1c4aa8153107
parent 62dacd6797f6aab0f096e440418cd5fe4e9d9ea3

am 62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf

* commit '62dacd6797f6aab0f096e440418cd5fe4e9d9ea3':
  Uncommenting throw when item not contained in sBgItemsIdMap

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c746b4d..dff1814 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -496,8 +496,7 @@
             if (stackTrace != null) {
                 e.setStackTrace(stackTrace);
             }
-            // TODO: something breaks this in the upgrade path
-            //throw e;
+            throw e;
         }
     }