summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-03-04 11:10:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-04 11:10:21 -0800
commitef38327f3a14132cb6845d929d90d03616437987 (patch)
tree7dec74868fb4b9864d222e2750ae8d08da7d1095 /telephony
parent055c986ab841f8f758398841730f1e90313b132a (diff)
parente4b293cd64da2825d9e051f64150328e4caee962 (diff)
downloadframeworks_base-ef38327f3a14132cb6845d929d90d03616437987.zip
frameworks_base-ef38327f3a14132cb6845d929d90d03616437987.tar.gz
frameworks_base-ef38327f3a14132cb6845d929d90d03616437987.tar.bz2
Merge "Update Singapore default time zone."
Diffstat (limited to 'telephony')
-rw-r--r--telephony/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
index 1ea1285..2d6977c 100644
--- a/telephony/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
+++ b/telephony/tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
@@ -33,7 +33,7 @@ public class MccTableTest extends AndroidTestCase {
assertEquals(MccTable.defaultTimeZoneForMcc(655), "Africa/Johannesburg");
assertEquals(MccTable.defaultTimeZoneForMcc(440), "Asia/Tokyo");
assertEquals(MccTable.defaultTimeZoneForMcc(441), "Asia/Tokyo");
- assertEquals(MccTable.defaultTimeZoneForMcc(525), "Singapore");
+ assertEquals(MccTable.defaultTimeZoneForMcc(525), "Asia/Singapore");
assertEquals(MccTable.defaultTimeZoneForMcc(240), null); // tz not defined, hence default
assertEquals(MccTable.defaultTimeZoneForMcc(0), null); // mcc not defined, hence default
assertEquals(MccTable.defaultTimeZoneForMcc(2000), null); // mcc not defined, hence default