From 39272d07d781494ac1b27ba4da50ab6e71e60efd Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 23 Aug 2013 18:07:30 -0700 Subject: 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 --- src/com/android/settings/ChooseLockGeneric.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com/android/settings/ChooseLockGeneric.java') 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); -- cgit v1.1