From f73fbf79a1db4bc5ccc829c8a84f3431ab986cbc Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 5 Sep 2012 12:17:55 -0700 Subject: [PATCH] Don't depend on LockPatternUtils to get DevicePolicyManager This fixes a crash where LockPatternUtils hasn't been set yet and keyguard attempts to get the device policy for widgets. This change breaks the dependency by getting a handle to DPM directly. Bug:7109723 Change-Id: Iecae91474358821ebd30456648377253864c35cf --- .../internal/policy/impl/keyguard/KeyguardHostView.java | 4 +++- 1 file changed, 3 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 e0ba211c2e252..da2f268e3e2ac 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;