Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent e5b5c11743 e3cac08ec6
commit 689b6c4052
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
View File

@@ -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;