summaryrefslogtreecommitdiffstats
path: root/src-ambient
diff options
context:
space:
mode:
authorStephen Bird <sbird@cyngn.com>2016-02-05 20:03:23 -0800
committerRichard MacGregor <rmacgregor@cyngn.com>2016-04-08 10:42:50 -0700
commit567526214eae4157e321372b8eae3f50c91b54b6 (patch)
treec3aa02fc06b51971b3c272a4657d587262658c06 /src-ambient
parent02d4b70e1f34fe6ee41367b6da8e62b5b13aa40c (diff)
downloadpackages_apps_PhoneCommon-567526214eae4157e321372b8eae3f50c91b54b6.tar.gz
packages_apps_PhoneCommon-567526214eae4157e321372b8eae3f50c91b54b6.tar.bz2
packages_apps_PhoneCommon-567526214eae4157e321372b8eae3f50c91b54b6.zip
Remove everchanging items
The hashcode needs to be able to link two call methods together without factoring in things like auth state and credits. Remove those items. Change-Id: I91b86d8976c6d07eb93c08231672ec436bcd0f61
Diffstat (limited to 'src-ambient')
-rw-r--r--src-ambient/incall/CallMethodInfo.java14
1 files changed, 5 insertions, 9 deletions
diff --git a/src-ambient/incall/CallMethodInfo.java b/src-ambient/incall/CallMethodInfo.java
index c4e0b52..63f24a8 100644
--- a/src-ambient/incall/CallMethodInfo.java
+++ b/src-ambient/incall/CallMethodInfo.java
@@ -76,12 +76,11 @@ public class CallMethodInfo {
@Override
public int hashCode() {
- return Objects.hashCode(mId, mUserHandle, mComponent, mName, mSummary, mSlotId, mSubId,
- mColor, mStatus, mIsAuthenticated, mMimeType, mVideoCallableMimeType,
- mSubscriptionButtonText, mCreditButtonText, mT9HintDescription, mSettingsIntent,
- mBrandIcon, mSingleColorBrandIcon, mBadgeIcon, mLoginIcon, mActionOneIcon,
- mActionTwoIcon, pluginResources, mActionOneText, mActionTwoText, mIsInCallProvider,
- mLoginIntent);
+ return Objects.hashCode(mId, mComponent, mName, mSummary, mSlotId, mSubId, mColor,
+ mMimeType, mVideoCallableMimeType, mSubscriptionButtonText, mCreditButtonText,
+ mT9HintDescription, mSettingsIntent, mBrandIcon, mSingleColorBrandIcon, mBadgeIcon,
+ mLoginIcon, mActionOneIcon, mActionTwoIcon, pluginResources, mActionOneText,
+ mActionTwoText, mIsInCallProvider, mLoginIntent);
}
public static final String TAG = "CallMethodInfo";
@@ -94,15 +93,12 @@ public class CallMethodInfo {
if (object instanceof CallMethodInfo) {
final CallMethodInfo info = (CallMethodInfo) object;
return Objects.equal(this.mId, info.mId)
- && Objects.equal(this.mUserHandle, info.mUserHandle)
&& Objects.equal(this.mComponent, info.mComponent)
&& Objects.equal(this.mName, info.mName)
&& Objects.equal(this.mSummary, info.mSummary)
&& Objects.equal(this.mSlotId, info.mSlotId)
&& Objects.equal(this.mSubId, info.mSubId)
&& Objects.equal(this.mColor, info.mColor)
- && Objects.equal(this.mStatus, info.mStatus)
- && Objects.equal(this.mIsAuthenticated, info.mIsAuthenticated)
&& Objects.equal(this.mMimeType, info.mMimeType)
&& Objects.equal(this.mVideoCallableMimeType, info.mVideoCallableMimeType)
&& Objects.equal(this.mSubscriptionButtonText, info.mSubscriptionButtonText)