Merge "Override device lock pattern visibility when unifying" into nyc-dev am: f19001f

am: f9d23d9

* commit 'f9d23d94f1f75dddcad7c3d6041794a77452bd41':
  Override device lock pattern visibility when unifying

Change-Id: I6666fbd5d10b7f9143f1d5f293da3e5db5b92417

src/com/android/settings/SecuritySettings.java

@@ -684,6 +684,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
                     mCurrentProfilePassword, mCurrentDevicePassword,
                     profileQuality, MY_USER_ID);
         }
+        final boolean profilePatternVisibility =
+                mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
+        mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);
         mCurrentDevicePassword = null;
         mCurrentProfilePassword = null;
     }