From 93bcfcb14d42ea0884b922ae1a4d84a6955ed835 Mon Sep 17 00:00:00 2001
From: Clara Bayarri <clarabayarri@google.com>
Date: Fri, 16 Oct 2015 12:36:57 +0100
Subject: [PATCH] Disable passphrase change flow encryption screen when not
 main user

When the user changing passphrase is not the process' user, disable
the "Ask for password on device startup" screen, as it makes no sense.

Change-Id: I521b5ec8702f7a39b94012a606794e04135e4c75
---
 src/com/android/settings/ChooseLockGeneric.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 3af3cd7a015..65f0ba6e91d 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -215,6 +215,7 @@ public class ChooseLockGeneric extends SettingsActivity {
         private void maybeEnableEncryption(int quality, boolean disabled) {
             DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
             if (UserManager.get(getActivity()).isAdminUser()
+                    && mUserId == UserHandle.myUserId()
                     && LockPatternUtils.isDeviceEncryptionEnabled()
                     && !dpm.getDoNotAskCredentialsOnBoot()) {
                 mEncryptionRequestQuality = quality;