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

Browse Source 
am: 748620e9f0

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

Change-Id: I82af33ea3b93c4017c845b1f791ebee403bffe21
This commit is contained in:
Ian Rogers
2016-06-01 17:54:22 +00:00
committed by android-build-merger
parent 023b338111 748620e9f0
commit e3cac08ec6
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;