From e95dc56aff18520cb890122eb920d6cb9045c6fe Mon Sep 17 00:00:00 2001 From: Martin Brabham Date: Thu, 7 Jan 2016 09:43:21 -0800 Subject: Prevent possible NPE during monkey test Change-Id: If12f50a843540ed07cfff96af17caf9f181945f4 Ticket-Id: OPO-296 --- src/com/android/launcher3/FocusIndicatorView.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/com') diff --git a/src/com/android/launcher3/FocusIndicatorView.java b/src/com/android/launcher3/FocusIndicatorView.java index ecf93e4b3..c30b56177 100644 --- a/src/com/android/launcher3/FocusIndicatorView.java +++ b/src/com/android/launcher3/FocusIndicatorView.java @@ -165,6 +165,9 @@ public class FocusIndicatorView extends View implements View.OnFocusChangeListen private static void computeLocationRelativeToParentHelper(View child, View commonParent, int[] shift) { + if (child == null) { + return; + } View parent = (View) child.getParent(); shift[0] += child.getLeft(); shift[1] += child.getTop(); -- cgit v1.2.3