commit 36504833e033f070d42534d91f2491bfd253828e
author Andrei Stingaceanu <stg@google.com> Fri Jan 08 10:25:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 08 10:25:52 2016 +0000
tree 9066dfa18318f61430d2f14f4ca5fcaa2a4c2cfd
parent ef7c7fe196438f59f58545e673576b35fb86ff70
parent 7a24019194b64cb83eb81cee41aac4449fac15c6

Merge "'Lock Screen Message' option is in enable state for 'None'."

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index fbe0f1c..4ce76ce 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -214,7 +214,8 @@
 
         mOwnerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
         if (mOwnerInfoPref != null) {
-            mOwnerInfoPref.setEnabled(!mLockPatternUtils.isDeviceOwnerInfoEnabled());
+            mOwnerInfoPref.setEnabled(!mLockPatternUtils.isLockScreenDisabled(MY_USER_ID)
+                    && !mLockPatternUtils.isDeviceOwnerInfoEnabled());
 
             if (mOwnerInfoPref.isEnabled()) {
                 mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {