From 579225f894b7d83bf14361aaaf843e1c621ee547 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sun, 6 May 2012 19:19:43 -0700
Subject: Fixing NPE in DragController. (Bug 6449615)

Change-Id: I84982043f4a39b0676c3d620fcd6e3c642cc5897
---
 src/com/android/launcher2/DragController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/com/android/launcher2')

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index b9d7dd4f9..9b617552e 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -381,8 +381,8 @@ public class DragController {
                     if (dragInfo != null &&
                         dragInfo.intent != null &&
                         info.intent != null) {
-                        boolean isSamePackage = dragInfo.intent.getPackage().equals(
-                                info.intent.getPackage());
+                        boolean isSamePackage = info.intent.getComponent().getPackageName().equals(
+                                dragInfo.intent.getComponent().getPackageName());
                         if (isSamePackage) {
                             cancelDrag();
                             return;
-- 
cgit v1.2.3