Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a570787 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect comparison" into klp-dev

parents 85dfc900 39272d07

src/com/android/settings/ChooseLockGeneric.java

+1 −1
Original line number Diff line number Diff line
@@ -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);