From dd767065fe354c25dc22a982deb136c9262bed5b Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Fri, 28 Apr 2017 08:19:34 -0700
Subject: [PATCH] Fix equality method implementation in BandConfig class.

Test: instrumentation (in master branch)
Bug: b/36863239
Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e
---
 core/java/android/hardware/radio/RadioManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/android/hardware/radio/RadioManager.java b/core/java/android/hardware/radio/RadioManager.java
index 14bb923767ed4..f079647a63d07 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;
         }
     }