Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2f374ff authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 60e1efe0: Fix NPE when dragging shortcut without component while app is uninstalled 

* commit '60e1efe0':
  Fix NPE when dragging shortcut without component while app is uninstalled
parents 21b35c52 60e1efe0

src/com/android/launcher3/DragController.java

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ public class DragController { 
                    if (dragInfo != null &&

                            dragInfo.intent != null && info != null) {

                        ComponentName cn = dragInfo.intent.getComponent();

                        boolean isSameComponent = cn.equals(info.componentName) ||

                                packageNames.contains(cn.getPackageName());

                        boolean isSameComponent = cn != null && (cn.equals(info.componentName) ||

                                packageNames.contains(cn.getPackageName()));

                        if (isSameComponent) {

                            cancelDrag();

                            return;