Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ca26e43 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents 91a65b53 f73fbf79

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

+3 −1
Original line number Diff line number Diff line
@@ -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;