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

Merge "CallAttributes.equals does deep check"

Browse Source
This commit is contained in:
Jordan Liu
2019-02-05 00:59:31 +00:00
committed by Gerrit Code Review
parent 256640541f 8eaa95322b
commit 8f7a989df5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/CallAttributes.java
View File

@@ -117,9 +117,9 @@ public class CallAttributes implements Parcelable {
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));
}
/**

10
telephony/java/android/telephony/PreciseCallState.java
View File

@@ -287,11 +287,11 @@ public final class PreciseCallState implements Parcelable {
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