diff options
| author | Jim Miller <jaggies@google.com> | 2012-09-04 15:20:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-04 15:20:42 -0700 |
| commit | 175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3 (patch) | |
| tree | 5892f9df667e5fed3fc3f18be7fb075869883632 /policy/src/com/android | |
| parent | 690420831c9b60f7fb2f1100aeef67ad79bfd3bb (diff) | |
| parent | b8ec470617590fa2025db869e8e80dcce8eaec23 (diff) | |
| download | frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.zip frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.tar.gz frameworks_base-175ae55c0d62b6adbc9b3cc215ad2e65a8b40cc3.tar.bz2 | |
Merge "Update DevicePolicyManager with ability to disable keyguard widgets" into jb-mr1-dev
Diffstat (limited to 'policy/src/com/android')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java | 9 |
1 files changed, 7 insertions, 2 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 2551c04..e0ba211 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -172,7 +172,7 @@ public class KeyguardHostView extends KeyguardViewBase { protected void onAttachedToWindow() { super.onAttachedToWindow(); mAppWidgetHost.startListening(); - populateWidgets(); + maybePopulateWidgets(); } @Override @@ -581,7 +581,12 @@ public class KeyguardHostView extends KeyguardViewBase { addWidget(view); } - private void populateWidgets() { + private void maybePopulateWidgets() { + if (mLockPatternUtils.getDevicePolicyManager().getKeyguardWidgetsDisabled(null) + != DevicePolicyManager.KEYGUARD_DISABLE_WIDGETS_NONE) { + Log.v(TAG, "Keyguard widgets disabled because of device policy admin"); + return; + } SharedPreferences prefs = mContext.getSharedPreferences( KEYGUARD_WIDGET_PREFS, Context.MODE_PRIVATE); for (String key : prefs.getAll().keySet()) { |