diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-10-05 12:24:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 12:24:47 -0700 |
| commit | b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6 (patch) | |
| tree | 10cc25ecfa74bfdad67ce0ddd10d982ce13788f6 /telephony | |
| parent | 111a4135d84485eff85bbca6a96cd91886deb7ba (diff) | |
| parent | 45a8901dc3ae12ad818ac2afdd63fe712769cb3b (diff) | |
| download | frameworks_base-b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6.zip frameworks_base-b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6.tar.gz frameworks_base-b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6.tar.bz2 | |
am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread
Merge commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b' into gingerbread-plus-aosp
* commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b':
Add supporting MCC=450(Korea)
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/MccTable.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/telephony/java/com/android/internal/telephony/MccTable.java b/telephony/java/com/android/internal/telephony/MccTable.java index b73c2f7..5539057 100644 --- a/telephony/java/com/android/internal/telephony/MccTable.java +++ b/telephony/java/com/android/internal/telephony/MccTable.java @@ -174,7 +174,7 @@ mcc_table = [ (438, 'tm', 2, 'Turkmenistan'), (440, 'jp', 2, 'Asia/Tokyo', 'ja', 14, 'Japan'), (441, 'jp', 2, 'Asia/Tokyo', 'ja', 14, 'Japan'), - (450, 'kr', 2, 'Korea (Republic of)'), + (450, 'kr', 2, 'Asia/Seoul', 'ko', 13, 'Korea (Republic of)'), (452, 'vn', 2, 'Viet Nam (Socialist Republic of)'), (454, 'hk', 2, '"Hong Kong, China"'), (455, 'mo', 2, '"Macao, China"'), @@ -378,6 +378,7 @@ public final class MccTable "", "Africa/Johannesburg", "Asia/Beijing", + "Asia/Seoul", "Asia/Singapore", "Asia/Tokyo", "Australia/Sydney", @@ -399,7 +400,8 @@ public final class MccTable * AUTO GENERATED (by the Python code above) */ private static final String[] LANG_STRINGS = { - "", "cs", "de", "en", "es", "fr", "it", "ja", "nl", "zh" + "", "cs", "de", "en", "es", "fr", "it", "ja", "ko", "nl", + "zh" }; /** @@ -446,13 +448,13 @@ public final class MccTable * default language 4 bits */ private static final int[] IND_CODES = { - 0x67720400, 0x6e6c6c68, 0x62650400, 0x667204b5, 0x6d630400, 0x61640400, - 0x657304a4, 0x68750400, 0x62610400, 0x68720400, 0x72730400, 0x697404d6, - 0x766104d6, 0x726f0400, 0x63680502, 0x637a6cc1, 0x736b0400, 0x61746ce2, - 0x67626c93, 0x67626c93, 0x646b0400, 0x73650400, 0x6e6f0400, 0x66690400, + 0x67720400, 0x6e6c6c79, 0x62650400, 0x667204c5, 0x6d630400, 0x61640400, + 0x657304b4, 0x68750400, 0x62610400, 0x68720400, 0x72730400, 0x697404e6, + 0x766104e6, 0x726f0400, 0x63680512, 0x637a6cd1, 0x736b0400, 0x61746cf2, + 0x67626ca3, 0x67626ca3, 0x646b0400, 0x73650400, 0x6e6f0400, 0x66690400, 0x6c740400, 0x6c760400, 0x65650400, 0x72750400, 0x75610400, 0x62790400, - 0x6d640400, 0x706c04f0, 0x64656c72, 0x67690400, 0x70740400, 0x6c750400, - 0x69650483, 0x69730400, 0x616c0400, 0x6d740400, 0x63790400, 0x67650400, + 0x6d640400, 0x706c0500, 0x64656c82, 0x67690400, 0x70740400, 0x6c750400, + 0x69650493, 0x69730400, 0x616c0400, 0x6d740400, 0x63790400, 0x67650400, 0x616d0400, 0x62670400, 0x74720400, 0x666f0400, 0x67650400, 0x676c0400, 0x736d0400, 0x736c0400, 0x6d6b0400, 0x6c690400, 0x6d650400, 0x63615e00, 0x706d0400, 0x75735e03, 0x75735e03, 0x75735e03, 0x75735e03, 0x75735e03, @@ -465,11 +467,11 @@ public final class MccTable 0x6c620400, 0x6a6f0400, 0x73790400, 0x69710400, 0x6b770400, 0x73610400, 0x79650400, 0x6f6d0400, 0x70730400, 0x61650400, 0x696c0400, 0x62680400, 0x71610400, 0x6d6e0400, 0x6e700400, 0x61650400, 0x61650400, 0x69720400, - 0x757a0400, 0x746a0400, 0x6b670400, 0x746d0400, 0x6a707447, 0x6a707447, - 0x6b720400, 0x766e0400, 0x686b0400, 0x6d6f0400, 0x6b680400, 0x6c610400, - 0x636e6c29, 0x636e6c29, 0x74770400, 0x6b700400, 0x62640400, 0x6d760400, - 0x6d790400, 0x61755c53, 0x69640400, 0x746c0400, 0x70680400, 0x74680400, - 0x73675c33, 0x626e0400, 0x6e7a0513, 0x6d700400, 0x67750400, 0x6e720400, + 0x757a0400, 0x746a0400, 0x6b670400, 0x746d0400, 0x6a707457, 0x6a707457, + 0x6b726c38, 0x766e0400, 0x686b0400, 0x6d6f0400, 0x6b680400, 0x6c610400, + 0x636e6c2a, 0x636e6c2a, 0x74770400, 0x6b700400, 0x62640400, 0x6d760400, + 0x6d790400, 0x61755c63, 0x69640400, 0x746c0400, 0x70680400, 0x74680400, + 0x73675c43, 0x626e0400, 0x6e7a0523, 0x6d700400, 0x67750400, 0x6e720400, 0x70670400, 0x746f0400, 0x73620400, 0x76750400, 0x666a0400, 0x77660400, 0x61730400, 0x6b690400, 0x6e630400, 0x70660400, 0x636b0400, 0x77730400, 0x666d0400, 0x6d680400, 0x70770400, 0x65670400, 0x647a0400, 0x6d610400, |