Merge "Fix call to equals that could never succeed." into nyc-dev am: 748620e9f0

am: e3cac08ec6

* commit 'e3cac08ec62973b1d92c7f02ea291eb96f4fe93a':
  Fix call to equals that could never succeed.

Change-Id: I5fa03a7d9cfa6e3c8ef2feb04838df3023b7aaae
This commit is contained in:
Ian Rogers
2016-06-01 22:52:02 +00:00
committed by android-build-merger

View File

@@ -701,8 +701,8 @@ public class RestrictedLockUtils {
if (userId != other.userId) { if (userId != other.userId) {
return false; return false;
} }
if ((component == null && other == null) || if ((component == null && other.component == null) ||
(component != null && component.equals(other))) { (component != null && component.equals(other.component))) {
return true; return true;
} }
return false; return false;