resolved conflicts for merge of c451da70 to ub-launcher3-master

Change-Id: I738fa16f82b3f3f1f6c63c5d1ce81347ade6467a
2015-08-04 10:26:12 -07:00
parent 9e97bf9919 c451da7059
commit 488d4bdf26
1 changed files with 5 additions and 1 deletions
@@ -3750,7 +3750,11 @@ public class Workspace extends PagedView
        if (parentCell != null) {
            parentCell.removeView(v);
        } else if (ProviderConfig.IS_DOGFOOD_BUILD) {
-            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);