commit 30a34ec0e23e8f96ceefaf78e835488353076dff
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Apr 28 20:09:03 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 20:09:04 2017 +0000
tree bbe6ec02fbedc230a63424281f044357740f9dc8
parent fd810d8727d0a79fdc9e467d3834e22628547025
parent dd767065fe354c25dc22a982deb136c9262bed5b

Merge "Fix equality method implementation in BandConfig class."

core/java/android/hardware/radio/RadioManager.java

diff --git a/core/java/android/hardware/radio/RadioManager.java b/core/java/android/hardware/radio/RadioManager.java
index 14bb923..f079647 100644
--- a/core/java/android/hardware/radio/RadioManager.java
+++ b/core/java/android/hardware/radio/RadioManager.java
@@ -755,8 +755,9 @@
             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;
         }
     }