summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMartin Brabham <optedoblivion@cyngn.com>2016-01-07 09:43:21 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-11 12:53:02 -0800
commitef976949dac77eb08e045ec59811a8140cc5c7f0 (patch)
treec61f29a30d38d9546d2b634f78f4a9257e93c842 /src/com
parent7eb751210a21174e8fccbe231bea0e5e351288cb (diff)
downloadandroid_packages_apps_Trebuchet-ef976949dac77eb08e045ec59811a8140cc5c7f0.tar.gz
android_packages_apps_Trebuchet-ef976949dac77eb08e045ec59811a8140cc5c7f0.tar.bz2
android_packages_apps_Trebuchet-ef976949dac77eb08e045ec59811a8140cc5c7f0.zip
Prevent possible NPE during monkey test
Change-Id: If12f50a843540ed07cfff96af17caf9f181945f4 Ticket-Id: OPO-296
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/FocusIndicatorView.java3
1 files changed, 3 insertions, 0 deletions
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();