diff options
| author | Michael Kolb <kolby@google.com> | 2011-11-16 11:22:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-16 11:22:27 -0800 |
| commit | b217888b48e01cdd92db7efa67d0ba8347c8538d (patch) | |
| tree | 7ecf9cad49748a225448b1afebeb96b470ee84b4 | |
| parent | 945aace87fb83d0a3f44bd9369932b1796c8dcc7 (diff) | |
| parent | 5685ce6b4ebd5fb8a1c70390c0719f33d0c8e44d (diff) | |
| download | Browser-b217888b48e01cdd92db7efa67d0ba8347c8538d.tar.gz | |
Merge "Prevent NPE in NavTabScroller" into ics-mr1
| -rw-r--r-- | src/com/android/browser/NavTabScroller.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/browser/NavTabScroller.java b/src/com/android/browser/NavTabScroller.java index 0bfe1851..c940bf55 100644 --- a/src/com/android/browser/NavTabScroller.java +++ b/src/com/android/browser/NavTabScroller.java @@ -241,6 +241,7 @@ public class NavTabScroller extends ScrollerView { void snapToSelected(int pos, boolean smooth) { if (pos < 0) return; View v = mContentView.getChildAt(pos); + if (v == null) return; int sx = 0; int sy = 0; if (mHorizontal) { |