commit 139966e42c7aa9d94ab913d7ffe744e6eceb4678
author Brian Attwell <brianattwell@google.com> Mon Feb 10 18:38:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 10 18:38:58 2014 +0000
tree 4a88e3edab138719149ca235319606a83541ccaf
parent 50a97c70703fecfa3e646df8e3ef800f94bcd603
parent 26dc5592145eeddcd435daf2dae29d8e483f1b7b

Merge "Don't initialize ActionBar with invalid tab index"

src/com/android/contacts/activities/ActionBarAdapter.java

diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index c707b62..f184d12 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -239,6 +239,10 @@
             // Just set to the field here.  The listener will be notified by update().
             mCurrentTab = savedState.getInt(EXTRA_KEY_SELECTED_TAB);
         }
+        if (mCurrentTab >= TabState.COUNT || mCurrentTab < 0) {
+            // Invalid tab index was saved (b/12938207). Restore the default.
+            mCurrentTab = TabState.DEFAULT;
+        }
         // Show tabs or the expanded {@link SearchView}, depending on whether or not we are in
         // search mode.
         update();