commit 2a5707874b6ec39798421f77e0ccf38dbaa1e65f
author Amith Yamasani <yamasani@google.com> Sat Aug 24 01:23:06 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 24 01:23:06 2013 +0000
tree 5566bc96a7372185d7def268f34ee1403fdb13fb
parent 85dfc9009fdad338cdda62cbcc549fde8479bdce
parent 39272d07d781494ac1b27ba4da50ab6e71e60efd

Merge "Fix incorrect comparison" into klp-dev

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 @@
          */
         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);