diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-08-15 18:09:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-15 18:09:06 -0700 |
| commit | 905c00a405ef2b26c58f19f21d153302c1e21e76 (patch) | |
| tree | 30a86faa7a711a53a443d59f1732a635eb0ffaab | |
| parent | 44a224cabf32a5ce117bbc2b409b49f59cfe1e0b (diff) | |
| parent | 55fe056d96bdb683dce0a4e66e7390d19f23e710 (diff) | |
| download | packages_apps_Settings-905c00a405ef2b26c58f19f21d153302c1e21e76.zip packages_apps_Settings-905c00a405ef2b26c58f19f21d153302c1e21e76.tar.gz packages_apps_Settings-905c00a405ef2b26c58f19f21d153302c1e21e76.tar.bz2 | |
am 55fe056d: Merge "Don\'t apply encryption password requirements for secondary users" into klp-dev
* commit '55fe056d96bdb683dce0a4e66e7390d19f23e710':
Don't apply encryption password requirements for secondary users
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index d4b9a26..6a34cbd 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -24,6 +24,8 @@ import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; import android.os.Bundle; +import android.os.Process; +import android.os.UserHandle; import android.os.UserManager; import android.preference.Preference; import android.preference.PreferenceActivity; @@ -255,6 +257,8 @@ public class ChooseLockGeneric extends PreferenceActivity { * appropriately.) */ private int upgradeQualityForEncryption(int quality) { + // Don't upgrade quality for secondary users. Encryption requirements don't apply. + if (Process.myUserHandle() != UserHandle.OWNER) return quality; int encryptionStatus = mDPM.getStorageEncryptionStatus(); boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE) || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING); |