From 82b517be0b3973781970be992b7a95157e3bfd0b Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Tue, 30 Oct 2012 20:12:53 -0700
Subject: [PATCH] Fix potential null pointer exeption in keyguard

The code was adding default widgets before setting mViewStateManager, which means the
callback from the transport control might access mViewStateManager before it's set.

Change-Id: I985a3c8062d0660519cb4a4c8c1b42c7c90f4ac7
---
 .../com/android/internal/policy/impl/keyguard/KeyguardHostView.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
index edb9d5135586..69d3e565d825 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -153,10 +153,11 @@ public class KeyguardHostView extends KeyguardViewBase {
         mAppWidgetContainer.setCallbacks(mWidgetCallbacks);
         mAppWidgetContainer.setMinScale(0.5f);
 
+        mViewStateManager = new KeyguardViewStateManager();
+
         addDefaultWidgets();
         addWidgetsFromSettings();
 
-        mViewStateManager = new KeyguardViewStateManager();
         SlidingChallengeLayout slider =
                 (SlidingChallengeLayout) findViewById(R.id.sliding_layout);
         if (slider != null) {
-- 
2.11.0