diff options
| author | Winson Chung <winsonc@google.com> | 2012-11-26 14:08:38 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-11-26 14:44:43 -0800 |
| commit | 1ef2123ccdf35f2e20ab180111bfa76c46c997e3 (patch) | |
| tree | f596c33d4e1099c93ed20e7fd6b535b78d967626 /src | |
| parent | ce552e91962bb343ef8cf074e2714aac2d5e710d (diff) | |
| download | android_packages_apps_Trebuchet-1ef2123ccdf35f2e20ab180111bfa76c46c997e3.tar.gz android_packages_apps_Trebuchet-1ef2123ccdf35f2e20ab180111bfa76c46c997e3.tar.bz2 android_packages_apps_Trebuchet-1ef2123ccdf35f2e20ab180111bfa76c46c997e3.zip | |
Fixing NPE in updateCurrentPageScroll (Bug 7465970)
Change-Id: I71d2b01518f3f736f6787ff6a503271b9ea7b04b
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 2cb943d7d..6d5d151f8 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -297,9 +297,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc * the previous tab page. */ protected void updateCurrentPageScroll() { - int offset = getChildOffset(mCurrentPage); - int relOffset = getRelativeChildOffset(mCurrentPage); - int newX = offset - relOffset; + // If the current page is invalid, just reset the scroll position to zero + int newX = 0; + if (0 <= mCurrentPage && mCurrentPage < getPageCount()) { + int offset = getChildOffset(mCurrentPage); + int relOffset = getRelativeChildOffset(mCurrentPage); + newX = offset - relOffset; + } scrollTo(newX, 0); mScroller.setFinalX(newX); mScroller.forceFinished(true); |