diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-03-23 16:05:40 -0700 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-08 10:42:51 -0700 |
| commit | 64949d39c941a76fb2a1c5460865f0d654083fe2 (patch) | |
| tree | a041ffb9963c37b0ce0a5e9fe398060ec0fbac76 | |
| parent | 89e55274354e5c1ba727574da3e81e1451c01a02 (diff) | |
| download | android_packages_apps_PhoneCommon-64949d39c941a76fb2a1c5460865f0d654083fe2.tar.gz android_packages_apps_PhoneCommon-64949d39c941a76fb2a1c5460865f0d654083fe2.tar.bz2 android_packages_apps_PhoneCommon-64949d39c941a76fb2a1c5460865f0d654083fe2.zip | |
Remove resources instance saved in CallMethodInfo
It wasn't being used, and we probably shouldn't be saving it anyway.
Change-Id: I55fd9df3e38fe22f65654d37f220d65254decb84
| -rw-r--r-- | src-ambient/incall/CallMethodHelper.java | 1 | ||||
| -rw-r--r-- | src-ambient/incall/CallMethodInfo.java | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src-ambient/incall/CallMethodHelper.java b/src-ambient/incall/CallMethodHelper.java index 623a9e2..4889980 100644 --- a/src-ambient/incall/CallMethodHelper.java +++ b/src-ambient/incall/CallMethodHelper.java @@ -633,7 +633,6 @@ public class CallMethodHelper { cmi.mSubscriptionButtonText = icpi.getSubscriptionButtonText(); cmi.mCreditButtonText = icpi.getCreditsButtonText(); cmi.mT9HintDescription = icpi.getT9HintDescription(); - cmi.pluginResources = pluginResources; cmi.mActionOneText = icpi.getActionOneTitle(); cmi.mActionTwoText = icpi.getActionTwoTitle(); cmi.mIsInCallProvider = true; diff --git a/src-ambient/incall/CallMethodInfo.java b/src-ambient/incall/CallMethodInfo.java index 4fa62a3..43a9d6a 100644 --- a/src-ambient/incall/CallMethodInfo.java +++ b/src-ambient/incall/CallMethodInfo.java @@ -93,7 +93,6 @@ public class CallMethodInfo { Expected format: Vector Drawable (.xml) 2 colors allowed. */ public Drawable mActionTwoIcon; - public Resources pluginResources; public String mActionOneText; public String mActionTwoText; public boolean mIsInCallProvider; @@ -142,7 +141,7 @@ public class CallMethodInfo { return Objects.hashCode(mId, mComponent, mName, mSummary, mSlotId, mSubId, mColor, mMimeType, mVideoCallableMimeType, mSubscriptionButtonText, mCreditButtonText, mT9HintDescription, mSettingsIntent, mBrandIcon, mSingleColorBrandIcon, mBadgeIcon, - mLoginIcon, mActionOneIcon, mActionTwoIcon, pluginResources, mActionOneText, + mLoginIcon, mActionOneIcon, mActionTwoIcon, mActionOneText, mActionTwoText, mIsInCallProvider, mLoginIntent, mDefaultDirectorySearchIntent, mDirectorySearchIntent, mInviteIntent, mAccountType, mAccountHandle, mBrandIconId, mLoginIconId, mNudgeComponent, mLoginSubtitle, mLoginNudgeEnable, @@ -180,7 +179,6 @@ public class CallMethodInfo { && Objects.equal(this.mLoginIcon, info.mLoginIcon) && Objects.equal(this.mActionOneIcon, info.mActionOneIcon) && Objects.equal(this.mActionTwoIcon, info.mActionTwoIcon) - && Objects.equal(this.pluginResources, info.pluginResources) && Objects.equal(this.mActionOneText, info.mActionOneText) && Objects.equal(this.mActionTwoText, info.mActionTwoText) && Objects.equal(this.mIsInCallProvider, info.mIsInCallProvider) |