PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect comparison

Browse Source 
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
This commit is contained in:
Amith Yamasani
2013-08-23 18:07:30 -07:00
parent 8c89872a21
commit 39272d07d7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -258,7 +258,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
*/ */
private int upgradeQualityForEncryption(int quality) { private int upgradeQualityForEncryption(int quality) {
// Don't upgrade quality for secondary users. Encryption requirements don't apply. // 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(); int encryptionStatus = mDPM.getStorageEncryptionStatus();
boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE) boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE)
|| (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING); || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING);