diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-08-23 18:07:30 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2013-08-23 18:07:30 -0700 |
| commit | 39272d07d781494ac1b27ba4da50ab6e71e60efd (patch) | |
| tree | 57b470a5d10d9f79097a058aa2e200bcb4e60623 /src/com/android/settings/ChooseLockGeneric.java | |
| parent | 8c89872a21859f413c139b232ee31d004fe24ebb (diff) | |
| download | packages_apps_Settings-39272d07d781494ac1b27ba4da50ab6e71e60efd.zip packages_apps_Settings-39272d07d781494ac1b27ba4da50ab6e71e60efd.tar.gz packages_apps_Settings-39272d07d781494ac1b27ba4da50ab6e71e60efd.tar.bz2 | |
Fix incorrect comparison
Bug: 10446469
Screen lock options should have been locked down when encryption is
enabled. An incorrect comparison (== instead of equals) caused it
to always bypass encryption quality check.
Change-Id: I7f3856146181a92183555f30bbc50d58bfe0c3d5
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 6a34cbd..017adfa 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -258,7 +258,7 @@ public class ChooseLockGeneric extends PreferenceActivity { */ private int upgradeQualityForEncryption(int quality) { // Don't upgrade quality for secondary users. Encryption requirements don't apply. - if (Process.myUserHandle() != UserHandle.OWNER) return quality; + if (!Process.myUserHandle().equals(UserHandle.OWNER)) return quality; int encryptionStatus = mDPM.getStorageEncryptionStatus(); boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE) || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING); |