From 3e4885d333ef0cf300ae277c1de2458b3023d7c2 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Mon, 30 May 2016 15:16:30 -0700 Subject: [PATCH] Fix call to equals that could never succeed. Caught by Error Prone. Bug: 29045331 Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7 (cherry picked from commit edf2f5747b9adc3399b59eb478c94641b1021222) --- .../src/com/android/settingslib/RestrictedLockUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java index 8e43bffbbfdce..2265d4214af18 100644 --- 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;