commit 075d493d738fc43bfb6bff56fa302bcb1d5ab7e7
author Mathew Inwood <mathewi@google.com> Wed Jun 29 15:38:18 2011 +0100
committer Mathew Inwood <mathewi@google.com> Wed Jun 29 17:58:23 2011 +0100
tree 95a5bc7b8ae2cd5b3006cdb6c4d67089de7fa809
parent ae0c0411bb502976c6374e30c5d1aa4271a64daf

Fix (workaround?) for NPE when showing a preloaded tab.

Change-Id: I4a12d40da7ad12d4f9f3c27e75fc4e07d0c1af62

src/com/android/browser/TabScrollView.java

diff --git a/src/com/android/browser/TabScrollView.java b/src/com/android/browser/TabScrollView.java
index f43d6d6..52dd6af 100644
--- a/src/com/android/browser/TabScrollView.java
+++ b/src/com/android/browser/TabScrollView.java
@@ -246,11 +246,11 @@
         @Override
         protected int getChildDrawingOrder(int count, int i) {
             int next = -1;
-            if ((i == (count - 1)) && (mSelected >= 0)) {
+            if ((i == (count - 1)) && (mSelected >= 0) && (mSelected < count)) {
                 next = mSelected;
             } else {
                 next = count - i - 1;
-                if (next <= mSelected) {
+                if (next <= mSelected && next > 0) {
                     next--;
                 }
             }