commit 77013af53c8883c8ac72a2252fb877250bbe44bd
author Jordan Liu <jminjie@google.com> Mon Feb 04 17:14:20 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 04 17:14:20 2019 -0800
tree eb63249deb3f0f025a6688f558fe7c1d56a1a5c5
parent 93bae4c4bc23c7cfe1e5563fafaf1bf3b9c90e74
parent 8f7a989df561d1bdadbebbed39ad3cc9294958be

Merge "CallAttributes.equals does deep check"
am: 8f7a989df5

Change-Id: Icf149a42d0138c08b3a6b12bb00f9eba7d7e6a4f

telephony/java/android/telephony/CallAttributes.java

diff --git a/telephony/java/android/telephony/CallAttributes.java b/telephony/java/android/telephony/CallAttributes.java
index a4cce9c..0d4f09f 100644
--- a/telephony/java/android/telephony/CallAttributes.java
+++ b/telephony/java/android/telephony/CallAttributes.java
@@ -117,9 +117,9 @@
 
         CallAttributes s = (CallAttributes) o;
 
-        return (mPreciseCallState == s.mPreciseCallState
+        return (Objects.equals(mPreciseCallState, s.mPreciseCallState)
                 && mNetworkType == s.mNetworkType
-                && mCallQuality == s.mCallQuality);
+                && Objects.equals(mCallQuality, s.mCallQuality));
     }
 
     /**

telephony/java/android/telephony/PreciseCallState.java

diff --git a/telephony/java/android/telephony/PreciseCallState.java b/telephony/java/android/telephony/PreciseCallState.java
index 59f3e1f..19e1931 100644
--- a/telephony/java/android/telephony/PreciseCallState.java
+++ b/telephony/java/android/telephony/PreciseCallState.java
@@ -287,11 +287,11 @@
             return false;
         }
         PreciseCallState other = (PreciseCallState) obj;
-        return (mRingingCallState != other.mRingingCallState &&
-            mForegroundCallState != other.mForegroundCallState &&
-            mBackgroundCallState != other.mBackgroundCallState &&
-            mDisconnectCause != other.mDisconnectCause &&
-            mPreciseDisconnectCause != other.mPreciseDisconnectCause);
+        return (mRingingCallState == other.mRingingCallState
+                && mForegroundCallState == other.mForegroundCallState
+                && mBackgroundCallState == other.mBackgroundCallState
+                && mDisconnectCause == other.mDisconnectCause
+                && mPreciseDisconnectCause == other.mPreciseDisconnectCause);
     }
 
     @Override