summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/ContactInfoCache.java
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-05-31 18:07:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-31 18:07:17 +0000
commitae06b1b3b86fcaffde9f94171bbb2b5649a95f14 (patch)
tree1f6349a450779c93e514fec9948d64e50d9b4e1e /java/com/android/incallui/ContactInfoCache.java
parent7f7f25f903e4649f12aaa255b32bd20cb4079183 (diff)
parent83b20211c3be04a850de3674977deee8e448d17f (diff)
Update Dialer to v10 RC45.
am: 83b20211c3 Change-Id: Ide21415247a3ec743f5438c49d29ba2d861081b0
Diffstat (limited to 'java/com/android/incallui/ContactInfoCache.java')
-rw-r--r--java/com/android/incallui/ContactInfoCache.java12
1 files changed, 1 insertions, 11 deletions
diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index 4c8ede906..e45eb9746 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -84,7 +84,6 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
private final ConcurrentHashMap<String, ContactCacheEntry> mInfoMap = new ConcurrentHashMap<>();
private final Map<String, Set<ContactInfoCacheCallback>> mCallBacks = new ArrayMap<>();
private Drawable mDefaultContactPhotoDrawable;
- private Drawable mConferencePhotoDrawable;
private int mQueryId;
private final DialerExecutor<CnapInformationWrapper> cachedNumberLookupExecutor =
DialerExecutors.createNonUiTaskBuilder(new CachedNumberLookupWorker()).build();
@@ -675,14 +674,6 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
return mDefaultContactPhotoDrawable;
}
- public Drawable getConferenceDrawable() {
- if (mConferencePhotoDrawable == null) {
- mConferencePhotoDrawable =
- mContext.getResources().getDrawable(R.drawable.img_conference_automirrored);
- }
- return mConferencePhotoDrawable;
- }
-
/** Callback interface for the contact query. */
public interface ContactInfoCacheCallback {
@@ -798,8 +789,7 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
maybeUpdateFromCequintCallerId(ci, cw.cnapName, mIsIncoming);
long time = SystemClock.uptimeMillis() - start;
Log.d(TAG, "Cequint Caller Id look up takes " + time + " ms.");
- updateCallerInfoInCacheOnAnyThread(
- cw.callId, cw.numberPresentation, ci, mIsIncoming, true, mQueryToken);
+ updateCallerInfoInCacheOnAnyThread(cw.callId, cw.numberPresentation, ci, mIsIncoming, true, mQueryToken);
}
@Override