diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2017-04-28 20:09:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-28 20:09:04 +0000 |
| commit | 30a34ec0e23e8f96ceefaf78e835488353076dff (patch) | |
| tree | bbe6ec02fbedc230a63424281f044357740f9dc8 /core/java | |
| parent | fd810d8727d0a79fdc9e467d3834e22628547025 (diff) | |
| parent | dd767065fe354c25dc22a982deb136c9262bed5b (diff) | |
Merge "Fix equality method implementation in BandConfig class."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/radio/RadioManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/hardware/radio/RadioManager.java b/core/java/android/hardware/radio/RadioManager.java index 14bb923767ed..f079647a63d0 100644 --- a/core/java/android/hardware/radio/RadioManager.java +++ b/core/java/android/hardware/radio/RadioManager.java @@ -755,8 +755,9 @@ public class RadioManager { if (!(obj instanceof BandConfig)) return false; BandConfig other = (BandConfig) obj; - if (mDescriptor != other.getDescriptor()) - return false; + BandDescriptor otherDesc = other.getDescriptor(); + if ((mDescriptor == null) != (otherDesc == null)) return false; + if (mDescriptor != null && !mDescriptor.equals(otherDesc)) return false; return true; } } |