diff options
| author | 2012-10-30 20:17:47 -0700 | |
|---|---|---|
| committer | 2012-10-30 20:18:10 -0700 | |
| commit | e0ec5d428f80fe49b291a0e0edd51a4398bde609 (patch) | |
| tree | c64c14e53e6286a9d49af754b2d46748e07dae07 | |
| parent | 8ea7cbe6f338b3dad2817eeca437221eede4298f (diff) | |
| parent | 82b517be0b3973781970be992b7a95157e3bfd0b (diff) | |
Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 748e0dfdcd22..960b57ef1c4c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -153,11 +153,12 @@ public class KeyguardHostView extends KeyguardViewBase { 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) { |