am b5f27ddb: am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev

* commit 'b5f27ddb3e56929db3cc9f4705a760caea371eb7':
  Keyguard sanity checks for when layout is not yet complete

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 3e1a12bba9c3..16d5728c3ed1 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java
@@ -471,6 +471,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);