Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a6a4df9 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

* commit '93563d21':
  Log a warning when action bar view states cannot be restored.
parents 09528f96 93563d21

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -1630,7 +1630,12 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        if (mActionBar != null) {

        if (mActionBar != null) {

            SparseArray<Parcelable> actionBarStates =

            SparseArray<Parcelable> actionBarStates =

                    savedInstanceState.getSparseParcelableArray(ACTION_BAR_TAG);

                    savedInstanceState.getSparseParcelableArray(ACTION_BAR_TAG);

            if (actionBarStates != null) {

                mActionBar.restoreHierarchyState(actionBarStates);

                mActionBar.restoreHierarchyState(actionBarStates);

            } else {

                Log.w(TAG, "Missing saved instance states for action bar views! " +

                        "State will not be restored.");

            }

        }

        }

    }

    }