commit 2a6a4df96dde5be55465816597506636bbb37cc2
author Adam Powell <adamp@google.com> Thu May 17 19:36:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 17 19:36:46 2012 -0700
tree 817a0bcfc4cfc54f58f634129269698533a58517
parent 09528f96f4bc5e1d7acb9c00011d232182fb93b2
parent 93563d21a97aee9bb60f6cbd975bb901fad29962

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

* commit '93563d21a97aee9bb60f6cbd975bb901fad29962':
  Log a warning when action bar view states cannot be restored.

policy/src/com/android/internal/policy/impl/PhoneWindow.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 5f5b5e8..0aa3018 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1630,7 +1630,12 @@
         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.");
+            }
         }
     }