diff options
| author | cretin45 <cretin45@gmail.com> | 2016-01-13 14:20:31 -0800 |
|---|---|---|
| committer | cretin45 <cretin45@gmail.com> | 2016-01-13 14:21:05 -0800 |
| commit | 5b044565f7e509069b5bdff4e71fd11281dc171f (patch) | |
| tree | c775f1bcd90564e04f4360d678032f8c99cd3654 /src/com/android/launcher3/PagedView.java | |
| parent | 4eaa0a55f486892baa328d2d7bedf9a486e34043 (diff) | |
| download | android_packages_apps_Trebuchet-5b044565f7e509069b5bdff4e71fd11281dc171f.tar.gz android_packages_apps_Trebuchet-5b044565f7e509069b5bdff4e71fd11281dc171f.tar.bz2 android_packages_apps_Trebuchet-5b044565f7e509069b5bdff4e71fd11281dc171f.zip | |
Trebuchet: Fix some monkey test race condition bugs
Issue-id: CYNGNOS-1587
Change-Id: I45ead8cfbd7fab3a9ae62f878a160a696c411e75
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 05f0a0553..786822c49 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1238,15 +1238,24 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc public void addFocusables(ArrayList<View> views, int direction, int focusableMode) { // XXX-RTL: This will be fixed in a future CL if (mCurrentPage >= 0 && mCurrentPage < getPageCount()) { - getPageAt(mCurrentPage).addFocusables(views, direction, focusableMode); + View page = getPageAt(mCurrentPage); + if (page != null) { + page.addFocusables(views, direction, focusableMode); + } } if (direction == View.FOCUS_LEFT) { if (mCurrentPage > 0) { - getPageAt(mCurrentPage - 1).addFocusables(views, direction, focusableMode); + View page = getPageAt(mCurrentPage - 1); + if (page != null) { + page.addFocusables(views, direction, focusableMode); + } } } else if (direction == View.FOCUS_RIGHT){ if (mCurrentPage < getPageCount() - 1) { - getPageAt(mCurrentPage + 1).addFocusables(views, direction, focusableMode); + View page = getPageAt(mCurrentPage + 1); + if (page != null) { + page.addFocusables(views, direction, focusableMode); + } } } } |