Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 664300c6 authored by Ta-wei Yen's avatar Ta-wei Yen Committed by Android (Google) Code Review
Browse files

Merge "Fix merge"

parents e9bb1717 4b2472a2

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

+4 −4
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ public class CallLogAdapter extends GroupingListAdapter 
            } 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 @@ public class CallLogAdapter extends GroupingListAdapter 
        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);