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

Commit 9ff6d4f8 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev

parents 79e0f875 5a2c5f0e

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

+8 −0
Original line number Diff line number Diff line
@@ -485,6 +485,14 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
            return;

        }

        mChallengeShowing = showChallenge;



        if (mExpandChallengeView == null || mChallengeView == null) {

            // These might not be here yet if we haven't been through layout.

            // If we haven't, the first layout pass will set everything up correctly

            // based on mChallengeShowing as set above.

            return;

        }



        if (mChallengeShowing) {

            mExpandChallengeView.setVisibility(View.INVISIBLE);

            mChallengeView.setVisibility(View.VISIBLE);