commit 664300c657fbfec010c3d2e948a387705ac69f64
author Ta-wei Yen <twyen@google.com> Tue Mar 22 03:00:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 22 03:00:10 2016 +0000
tree 8b00298b3fe78d7c45b8d0a191efcb5f983df7cf
parent e9bb17176fec90286f928f1be7f0e293aeb1535c
parent 4b2472a2bc65ef89a5a325e23c13b33358a16a9a

Merge "Fix merge"

src/com/android/dialer/calllog/CallLogAdapter.java

diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 3f41b1c..165594e 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -178,6 +178,9 @@
             } else {
                 if (viewHolder.callType == CallLog.Calls.MISSED_TYPE) {
                     CallLogAsyncTaskUtil.markCallAsRead(mContext, viewHolder.callIds);
+                    if (mActivityType == ACTIVITY_TYPE_DIALTACTS) {
+                        ((DialtactsActivity) v.getContext()).updateTabUnreadCounts();
+                    }
                 }
                 expandViewHolderActions(viewHolder);
             }
@@ -522,10 +525,7 @@
         details.features = getCallFeatures(c, count);
         details.geocode = c.getString(CallLogQuery.GEOCODED_LOCATION);
         details.transcription = c.getString(CallLogQuery.TRANSCRIPTION);
-        if (details.callTypes[0] == CallLog.Calls.VOICEMAIL_TYPE ||
-                details.callTypes[0] == CallLog.Calls.MISSED_TYPE) {
-            details.isRead = c.getInt(CallLogQuery.IS_READ) == 1;
-        }
+        details.callTypes = getCallTypes(c, count);
 
         if (!c.isNull(CallLogQuery.DATA_USAGE)) {
             details.dataUsage = c.getLong(CallLogQuery.DATA_USAGE);