From d3ca4fb300107fe5462f278d3849196ddceb0d9d Mon Sep 17 00:00:00 2001
From: Clara Bayarri <clarabayarri@google.com>
Date: Mon, 25 Jan 2016 13:20:17 +0000
Subject: [PATCH] Show unification option only when it will result in a
 compliant lock

Change-Id: I05ce21e8949c81313bc686273a9cec93bf5f2a9f
---
 .../android/settings/ProfileChallengePreferenceFragment.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);