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

Merge "Fix equality method implementation in BandConfig class."

Browse Source 
am: 30a34ec0e2

Change-Id: I15d46cb69410efdc369d628f1681a880c1420d9d
This commit is contained in:
Tomasz Wasilczyk
2017-04-28 20:19:11 +00:00
committed by android-build-merger
parent 6512f5eb10 30a34ec0e2
commit 5acbf70872
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/radio/RadioManager.java
View File

@@ -755,8 +755,9 @@ public class RadioManager {
if (!(obj instanceof BandConfig)) if (!(obj instanceof BandConfig))
return false; return false;
BandConfig other = (BandConfig) obj; BandConfig other = (BandConfig) obj;
if (mDescriptor != other.getDescriptor()) BandDescriptor otherDesc = other.getDescriptor();
return false; if ((mDescriptor == null) != (otherDesc == null)) return false;
if (mDescriptor != null && !mDescriptor.equals(otherDesc)) return false;
return true; return true;
} }
} }