Merge "Fix call to equals that could never succeed."

2016-05-31 17:45:00 +00:00
parent fd85694e8a edf2f5747b
commit 923427ee40
1 changed files with 2 additions and 2 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
@@ -701,8 +701,8 @@ public class RestrictedLockUtils {
            if (userId != other.userId) {
                return false;
            }
-            if ((component == null && other == null) ||
-                    (component != null && component.equals(other))) {
+            if ((component == null && other.component == null) ||
+                    (component != null && component.equals(other.component))) {
                return true;
            }
            return false;