summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryingrenw <yingrenw@codeaurora.org>2017-01-03 20:05:15 +0800
committerArne Coucheron <arco68@gmail.com>2017-12-15 06:27:55 +0100
commitc257fab4f77b205072ae1bb8141805df7b6ef68d (patch)
treedf24f9d74e524725d13f8430984da1ec9df1f42a
parent8b50e968bbe6b02cb036f3adec52ab66d554024e (diff)
downloadandroid_packages_apps_Trebuchet-c257fab4f77b205072ae1bb8141805df7b6ef68d.tar.gz
android_packages_apps_Trebuchet-c257fab4f77b205072ae1bb8141805df7b6ef68d.tar.bz2
android_packages_apps_Trebuchet-c257fab4f77b205072ae1bb8141805df7b6ef68d.zip
Launcher3: Stability NullPointer issue
Description: Compute a child location by recursion, it may not have parent view. When the child doesn't have parent, should break the recursive. Change-Id: I8707712b85c10bf1c1d3860c5b8323aefd455cf2 CRs-Fixed: 1104931
-rw-r--r--src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java b/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
index bd5c06e5b..06ca66706 100644
--- a/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
+++ b/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
@@ -55,7 +55,7 @@ public class ViewGroupFocusHelper extends FocusIndicatorHelper {
outRect.left += child.getLeft();
outRect.top += child.getTop();
- if (parent != mContainer) {
+ if (parent != null && parent != mContainer) {
if (parent instanceof PagedView) {
PagedView page = (PagedView) parent;
outRect.left -= page.getScrollForPage(page.indexOfChild(child));