Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev

Author: Jim Miller

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

@@ -153,11 +153,12 @@ protected void onFinishInflate() {
         mAppWidgetContainer.setCallbacks(mWidgetCallbacks);
         mAppWidgetContainer.setMinScale(0.5f);
 
+        mViewStateManager = new KeyguardViewStateManager();
+
         addDefaultWidgets();
         addWidgetsFromSettings();
         mSwitchPageRunnable.run();
 
-        mViewStateManager = new KeyguardViewStateManager();
         SlidingChallengeLayout slider =
                 (SlidingChallengeLayout) findViewById(R.id.sliding_layout);
         if (slider != null) {