summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-08-04 02:32:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-04 02:32:57 +0000
commitc451da705907edaaaef4fdd44f1304872c0b5b0d (patch)
treef92529d04b33b55cf7d1e35b4675c51ecd308bc0
parent209a859dedba0e8314ee102a760aad78a814ea94 (diff)
parent912bdfcffa04f8917ff56cc4e059208c13cbe29c (diff)
downloadandroid_packages_apps_Trebuchet-c451da705907edaaaef4fdd44f1304872c0b5b0d.tar.gz
android_packages_apps_Trebuchet-c451da705907edaaaef4fdd44f1304872c0b5b0d.tar.bz2
android_packages_apps_Trebuchet-c451da705907edaaaef4fdd44f1304872c0b5b0d.zip
Merge "Replacing exception with a log, when uninstalling an app leads to an illegal state" into ub-launcher3-burnaby
-rw-r--r--src/com/android/launcher3/Workspace.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 086934773..662eabc7c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3768,7 +3768,11 @@ public class Workspace extends PagedView
if (parentCell != null) {
parentCell.removeView(v);
} else if (LauncherAppState.isDogfoodBuild()) {
- throw new NullPointerException("mDragInfo.cell has null parent");
+ // When an app is uninstalled using the drop target, we wait until resume to remove
+ // the icon. We also remove all the corresponding items from the workspace at
+ // {@link Launcher#bindComponentsRemoved}. That call can come before or after
+ // {@link Launcher#mOnResumeCallbacks} depending on how busy the worker thread is.
+ Log.e(TAG, "mDragInfo.cell has null parent");
}
if (v instanceof DropTarget) {
mDragController.removeDropTarget((DropTarget) v);