diff options
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
-rw-r--r-- | src/com/android/launcher2/DragController.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index 84f151581..4c4295319 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -326,19 +326,17 @@ public class DragController { } endDrag(); } - public void onAppsRemoved(ArrayList<ApplicationInfo> apps, Context context) { + public void onAppsRemoved(ArrayList<String> packageNames, Context context) { // Cancel the current drag if we are removing an app that we are dragging if (mDragObject != null) { Object rawDragInfo = mDragObject.dragInfo; if (rawDragInfo instanceof ShortcutInfo) { ShortcutInfo dragInfo = (ShortcutInfo) rawDragInfo; - for (ApplicationInfo info : apps) { + for (String pn : packageNames) { // Added null checks to prevent NPE we've seen in the wild if (dragInfo != null && - dragInfo.intent != null && - info.intent != null) { - boolean isSamePackage = dragInfo.getPackageName().equals( - info.getPackageName()); + dragInfo.intent != null) { + boolean isSamePackage = dragInfo.getPackageName().equals(pn); if (isSamePackage) { cancelDrag(); return; |