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

2011-08-30 13:45:30 -07:00
parent c6f19da0ff 4144a06025
commit be1a0493a8
1 changed files with 2 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
+++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
@@ -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) {