diff --git a/src/com/android/settings/ProfileChallengePreferenceFragment.java b/src/com/android/settings/ProfileChallengePreferenceFragment.java index 5d396410226..bd8a7b78292 100644 --- a/src/com/android/settings/ProfileChallengePreferenceFragment.java +++ b/src/com/android/settings/ProfileChallengePreferenceFragment.java @@ -238,7 +238,8 @@ public class ProfileChallengePreferenceFragment extends SettingsPreferenceFragme private void maybeAddUnificationPreference(PreferenceGroup securityCategory) { if (mLockPatternUtils.getKeyguardStoredPasswordQuality(mProfileUserId) - >= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) { + >= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING + && mLockPatternUtils.isSeparateProfileChallengeAllowedToUnify(mProfileUserId)) { Preference unificationPreference = new Preference(securityCategory.getContext()); unificationPreference.setKey(KEY_UNIFICATION); unificationPreference.setTitle(R.string.lock_settings_profile_unification_title);