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

Commit 531a8305 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Code Review
Browse files

Merge "Send local time, not GMT, in timestamp."

parents 08eb78f1 f59c72a1
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ public class BluetoothPbapCallLogComposer {
    private static final String VCARD_PROPERTY_CALLTYPE_OUTGOING = "DIALED";
    private static final String VCARD_PROPERTY_CALLTYPE_MISSED = "MISSED";

    private static final String FLAG_TIMEZONE_UTC = "Z";

    private final Context mContext;
    private ContentResolver mContentResolver;
    private Cursor mCursor;
@@ -247,13 +245,12 @@ public class BluetoothPbapCallLogComposer {

    /**
     * Format according to RFC 2445 DATETIME type.
     * The format is: ("%Y%m%dT%H%M%SZ").
     * The format is: ("%Y%m%dT%H%M%S").
     */
    private final String toRfc2455Format(final long millSecs) {
        Time startDate = new Time();
        startDate.set(millSecs);
        String date = startDate.format2445();
        return date + FLAG_TIMEZONE_UTC;
        return startDate.format2445();
    }

    /**
@@ -268,7 +265,7 @@ public class BluetoothPbapCallLogComposer {
        // to the requesting device (For example, transferring phone book
        // when connected over bluetooth)
        //
        // e.g. "X-IRMC-CALL-DATETIME;MISSED:20050320T100000Z"
        // e.g. "X-IRMC-CALL-DATETIME;MISSED:20050320T100000"
        final int callLogType = mCursor.getInt(CALL_TYPE_COLUMN_INDEX);
        final String callLogTypeStr;
        switch (callLogType) {