summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorJake Hamby <jhamby@google.com>2011-08-29 16:25:07 -0700
committerJake Hamby <jhamby@google.com>2011-08-29 16:28:27 -0700
commit4144a060257004902fb53c967c408217399e3fc2 (patch)
tree4b71ad07bb8d6a7ca5bdaa28863eaf5a85d51238 /telephony/java
parent32901b4fec5db9a137add68f0f38518636593668 (diff)
downloadframeworks_base-4144a060257004902fb53c967c408217399e3fc2.zip
frameworks_base-4144a060257004902fb53c967c408217399e3fc2.tar.gz
frameworks_base-4144a060257004902fb53c967c408217399e3fc2.tar.bz2
Use the local timezone for CDMA SMS timestamps.
3GPP2 uses the local timezone for timestamps in SMS messages. Use the local timezone instead of UTC when decoding bearer data. Bug: 5123883 Change-Id: Iec25bcbb7862f0794ead80b6923c815b68bdd2a5
Diffstat (limited to 'telephony/java')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/cdma/sms/BearerData.java3
1 files changed, 2 insertions, 1 deletions
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 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) {