Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev

1 files changed, 3 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 e0ba211c2e25..da2f268e3e2a 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -582,7 +582,9 @@ public class KeyguardHostView extends KeyguardViewBase {
     }
 
     private void maybePopulateWidgets() {
-        if (mLockPatternUtils.getDevicePolicyManager().getKeyguardWidgetsDisabled(null)
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        if (dpm != null && dpm.getKeyguardWidgetsDisabled(null)
                 != DevicePolicyManager.KEYGUARD_DISABLE_WIDGETS_NONE) {
             Log.v(TAG, "Keyguard widgets disabled because of device policy admin");
             return;