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

am 23f4337b: am 2a570787: Merge "Fix incorrect comparison" into klp-dev

Browse Source 
* commit '23f4337ba44b26e229e8886c4ac75abf41060a39':
  Fix incorrect comparison
This commit is contained in:
Amith Yamasani
2013-08-26 15:09:38 -07:00
committed by Android Git Automerger
parent 541cdaafd0 23f4337ba4
commit f7fc44d35e
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);