Merge "Fixing issue where shortcuts and widgets were not being removed when the package was uninstalled (Bug 2657997, Bug 6335843)" into jb-dev

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2012-04-30 10:22:37 -07:00
commit da954bb599
7 files changed
+35 -25

No files matched your search

@@ -380,10 +380,13 @@ public class DragController {
// Added null checks to prevent NPE we've seen in the wild
if (dragInfo != null &&
dragInfo.intent != null &&
info.intent != null &&
dragInfo.intent.getComponent().equals(info.intent.getComponent())) {
cancelDrag();
return;
info.intent != null) {
boolean isSamePackage = dragInfo.intent.getPackage().equals(
info.intent.getPackage());
if (isSamePackage) {
cancelDrag();
return;
}
}
}
}