diff options
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java index f98ba352f546..7a71d8c37a66 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java @@ -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); |