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

Commit a3c6d8cf authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 415b8125: am d805c677: Merge "Possible NullPointerException in restorePanelState" 

* commit '415b8125':
  Possible NullPointerException in restorePanelState
parents 5e4f01f0 415b8125

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

+3 −1
Original line number Diff line number Diff line
@@ -1657,7 +1657,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
     */

    private void restorePanelState(SparseArray<Parcelable> icicles) {

        PanelFeatureState st;

        for (int curFeatureId = icicles.size() - 1; curFeatureId >= 0; curFeatureId--) {

        int curFeatureId;

        for (int i = icicles.size() - 1; i >= 0; i--) {

            curFeatureId = icicles.keyAt(i);

            st = getPanelState(curFeatureId, false /* required */);

            if (st == null) {

                // The panel must not have been required, and is currently not around, skip it