aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 07:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hyunyoung Song
2015-05-28 21:48:24 +00:00
committed by Android (Google) Code Review
parent c3d4553d46 89aeda1b78
commit a14cb230da
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/FocusHelper.java
View File

@@ -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