diff options
| author | Michael Kolb <kolby@google.com> | 2011-11-16 11:27:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-16 11:27:03 -0800 |
| commit | c6e844739a4ed05ceb5110b313a560e9e89a57d1 (patch) | |
| tree | 7ecf9cad49748a225448b1afebeb96b470ee84b4 | |
| parent | 3703ef56dad4419d0e9772a747fe9ef30524d507 (diff) | |
| parent | b217888b48e01cdd92db7efa67d0ba8347c8538d (diff) | |
| download | packages_apps_browser-c6e844739a4ed05ceb5110b313a560e9e89a57d1.zip packages_apps_browser-c6e844739a4ed05ceb5110b313a560e9e89a57d1.tar.gz packages_apps_browser-c6e844739a4ed05ceb5110b313a560e9e89a57d1.tar.bz2 | |
am b217888b: Merge "Prevent NPE in NavTabScroller" into ics-mr1
* commit 'b217888b48e01cdd92db7efa67d0ba8347c8538d':
Prevent NPE in NavTabScroller
| -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 0bfe185..c940bf5 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) { |