Merge "Guard against monkey actor test NPE inside FocusHelper b/19626762" into ub-launcher3-almonte
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
index e607047..0dca078 100644
--- a/src/com/android/launcher3/FocusHelper.java
+++ b/src/com/android/launcher3/FocusHelper.java
@@ -284,6 +284,12 @@
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