commit be1a0493a8bf589137874bec4222297fbb712185
author Jake Hamby <jhamby@google.com> Tue Aug 30 13:45:30 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 30 13:45:30 2011 -0700
tree f7e88b7a453b725cdfaf7353daa5d02772767ab8
parent c6f19da0ff703adff8a6a06e0b19ea46abada644
parent 4144a060257004902fb53c967c408217399e3fc2

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

telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java

diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
index e17d98d..6743da0 100755
--- 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 android.content.res.Resources;
 
+import java.util.TimeZone;
 
 
 /**
@@ -231,7 +232,7 @@
     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) {