| commit | 748620e9f03dd66bfed38d91d32b35d79684173b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 01 17:46:01 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 01 17:46:03 2016 +0000 |
| tree | 29610159167d7a2f19d5f0159ca563f80d723389 | |
| parent | 4215ae01002f1217587698d24636870ace4a50f5 [diff] | |
| parent | 3e4885d333ef0cf300ae277c1de2458b3023d7c2 [diff] |
Merge "Fix call to equals that could never succeed." into nyc-dev
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java index 8e43bff..2265d42 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
@@ -701,8 +701,8 @@ 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;