commit dbf3981ccbacb11a99c262fc5ebbece62b207a2d
author Michael Kolb <kolby@google.com> Fri Jun 10 14:06:40 2011 -0700
committer Michael Kolb <kolby@google.com> Fri Jun 10 14:06:47 2011 -0700
tree fc82e864b5bb63bd665718c6f9b69676666b411b
parent 26d56c6833526718de9dadca60b53f1f851831eb

fix various NPEs

    Bugs: 4597115
    	  4580514
	  4580511
	  4560889
	  4545346

    Monkey proofing nav screen;
    disabled pause/resume during scroll

Change-Id: I4e24b91fc0b6c008cb4e2df113316c0063f0c915

src/com/android/browser/TabControl.java

diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index 0aaf3d6..1e21431 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -286,7 +286,11 @@
             }
         }
         outState.putLongArray(POSITIONS, ids);
-        final long cid = getCurrentTab().getId();
+        Tab current = getCurrentTab();
+        long cid = -1;
+        if (current != null) {
+            cid = current.getId();
+        }
         outState.putLong(CURRENT, cid);
     }