commit f19001f2c0517b478dd07feb9b7427a1b506adb1
author Daniel U <uda@google.com> Tue Mar 29 09:34:05 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 09:34:05 2016 +0000
tree ccb28e3dd0f96b46215aad509078388dd74178ef
parent 47f67c1ff783422fa799128eb8f1215018855b26
parent 4af1661bfb62f322b066d7a7fd537e5c1deb989c

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

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index c3efb62..333f6b8 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -684,6 +684,9 @@
                     mCurrentProfilePassword, mCurrentDevicePassword,
                     profileQuality, MY_USER_ID);
         }
+        final boolean profilePatternVisibility =
+                mLockPatternUtils.isVisiblePatternEnabled(mProfileChallengeUserId);
+        mLockPatternUtils.setVisiblePatternEnabled(profilePatternVisibility, MY_USER_ID);
         mCurrentDevicePassword = null;
         mCurrentProfilePassword = null;
     }