Merge "Log a warning when action bar view states cannot be restored." into jb-dev

2012-05-17 19:35:00 -07:00
parent c8c4ced838 fb5f1bc085
commit 93563d21a9
1 changed files with 6 additions and 1 deletions
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1630,7 +1630,12 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
        if (mActionBar != null) {
            SparseArray<Parcelable> actionBarStates =
                    savedInstanceState.getSparseParcelableArray(ACTION_BAR_TAG);
-            mActionBar.restoreHierarchyState(actionBarStates);
+            if (actionBarStates != null) {
+                mActionBar.restoreHierarchyState(actionBarStates);
+            } else {
+                Log.w(TAG, "Missing saved instance states for action bar views! " +
+                        "State will not be restored.");
+            }
        }
    }