summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/TabControl.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-06-10 14:06:40 -0700
committerMichael Kolb <kolby@google.com>2011-06-10 14:06:47 -0700
commitdbf3981ccbacb11a99c262fc5ebbece62b207a2d (patch)
treefc82e864b5bb63bd665718c6f9b69676666b411b /src/com/android/browser/TabControl.java
parent26d56c6833526718de9dadca60b53f1f851831eb (diff)
downloadandroid_packages_apps_Gello-dbf3981ccbacb11a99c262fc5ebbece62b207a2d.tar.gz
android_packages_apps_Gello-dbf3981ccbacb11a99c262fc5ebbece62b207a2d.tar.bz2
android_packages_apps_Gello-dbf3981ccbacb11a99c262fc5ebbece62b207a2d.zip
fix various NPEs
Bugs: 4597115 4580514 4580511 4560889 4545346 Monkey proofing nav screen; disabled pause/resume during scroll Change-Id: I4e24b91fc0b6c008cb4e2df113316c0063f0c915
Diffstat (limited to 'src/com/android/browser/TabControl.java')
-rw-r--r--src/com/android/browser/TabControl.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index 0aaf3d65..1e21431e 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -286,7 +286,11 @@ class TabControl {
}
}
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);
}