summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
authoryingrenw <yingrenw@codeaurora.org>2017-01-03 20:05:15 +0800
committerKevin F. Haggerty <haggertk@lineageos.org>2018-11-01 22:01:44 -0600
commit2d29485e9db260ebddcd879965f92a814cbee37a (patch)
tree3b8700bde94edda47a1971b923b672f4084c9df1 /src/com/android/launcher3
parentf59dec8de95eeb9ece371bb0e91badf861355e0c (diff)
downloadandroid_packages_apps_Trebuchet-2d29485e9db260ebddcd879965f92a814cbee37a.tar.gz
android_packages_apps_Trebuchet-2d29485e9db260ebddcd879965f92a814cbee37a.tar.bz2
android_packages_apps_Trebuchet-2d29485e9db260ebddcd879965f92a814cbee37a.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
Diffstat (limited to 'src/com/android/launcher3')
-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 fde220cbf..b6fcdf414 100644
--- a/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
+++ b/src/com/android/launcher3/keyboard/ViewGroupFocusHelper.java
@@ -54,7 +54,7 @@ public class ViewGroupFocusHelper extends FocusIndicatorHelper {
outRect.left += child.getX();
outRect.top += child.getY();
- if (parent != mContainer) {
+ if (parent != null && parent != mContainer) {
if (parent instanceof PagedView) {
PagedView page = (PagedView) parent;
outRect.left -= page.getScrollForPage(page.indexOfChild(child));