From 5a2c5f0efacf5f11a928c8481f6747c3d13ddcfd Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 5 Nov 2012 15:41:07 -0800
Subject: [PATCH] Keyguard sanity checks for when layout is not yet complete

Bug 7470163

Change-Id: I1e5f860ab39633f6c5e2046f6f18424227842406
---
 .../policy/impl/keyguard/SlidingChallengeLayout.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

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 f98ba352f5468..7a71d8c37a66a 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);