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

Commit a14cb230 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Guard against monkey actor test NPE inside FocusHelper b/19626762" into ub-launcher3-almonte

parents c3d4553d 89aeda1b

src/com/android/launcher3/FocusHelper.java

+6 −0
Original line number Diff line number Diff line
@@ -284,6 +284,12 @@ public class FocusHelper { 
                    if (workspace != null) {

                        int pageIndex = workspace.getCurrentPage();

                        CellLayout topLayout = (CellLayout) workspace.getChildAt(pageIndex);

                        if (topLayout == null) {

                            // This is to guard against monkey actor test where the cell layout

                            // of the new pageIndex is null monkey issuing commands while

                            // animations happen.

                            return wasHandled;

                        }

                        ShortcutAndWidgetContainer children = topLayout.getShortcutsAndWidgets();

                        final View newIcon = getIconInDirection(layout, children, -1, 1);

                        // Select the first bubble text view in the current page of the workspace