summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockSettingsHelper.java
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2015-08-04 16:55:00 -0700
committerAndres Morales <anmorales@google.com>2015-08-05 19:57:51 -0700
commit7bdffd85ebae7b5b14eef07059cb501451476c7d (patch)
tree4d934dfc88ecce20022dd5a07fd4654fcff42ff2 /src/com/android/settings/ChooseLockSettingsHelper.java
parent1adca55ffe10f1741e5fb75bf0e7530ca200d712 (diff)
downloadpackages_apps_Settings-7bdffd85ebae7b5b14eef07059cb501451476c7d.zip
packages_apps_Settings-7bdffd85ebae7b5b14eef07059cb501451476c7d.tar.gz
packages_apps_Settings-7bdffd85ebae7b5b14eef07059cb501451476c7d.tar.bz2
fix CC for work profiles
Bug: 22257554 Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
Diffstat (limited to 'src/com/android/settings/ChooseLockSettingsHelper.java')
-rw-r--r--src/com/android/settings/ChooseLockSettingsHelper.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index c07186f..327e622 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -118,7 +118,10 @@ public final class ChooseLockSettingsHelper {
boolean returnCredentials, boolean external, boolean hasChallenge,
long challenge) {
boolean launched = false;
- switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId())) {
+
+ int effectiveUserId = Utils.getEffectiveUserId(mActivity);
+
+ switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(effectiveUserId)) {
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
launched = launchConfirmationActivity(request, title, header, description,
returnCredentials || hasChallenge