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

Commit be1a0493 authored by Jake Hamby's avatar Jake Hamby Committed by Android (Google) Code Review
Browse files

Merge "Use the local timezone for CDMA SMS timestamps."

parents c6f19da0 4144a060
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.internal.util.BitwiseOutputStream;

import android.content.res.Resources;

import java.util.TimeZone;


/**
@@ -231,7 +232,7 @@ public final class BearerData {
    public static class TimeStamp extends Time {

        public TimeStamp() {
            super(Time.TIMEZONE_UTC);
            super(TimeZone.getDefault().getID());   // 3GPP2 timestamps use the local timezone
        }

        public static TimeStamp fromByteArray(byte[] data) {