diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-07-09 09:37:25 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-07-09 09:37:25 +0400 |
| commit | a0aedc3ba8859cb874b9cc0862cbd8b1e4e8ffb8 (patch) | |
| tree | 378bfebd62d32a1a24f87df82845e0898d24d4c2 /telephony/java/com/android | |
| parent | 8239114f53043ed9fc5e6c64717230faeba928e9 (diff) | |
| parent | 0219defc4afadaafc740a2b1ce482682625bf0e4 (diff) | |
| download | frameworks_base-a0aedc3ba8859cb874b9cc0862cbd8b1e4e8ffb8.zip frameworks_base-a0aedc3ba8859cb874b9cc0862cbd8b1e4e8ffb8.tar.gz frameworks_base-a0aedc3ba8859cb874b9cc0862cbd8b1e4e8ffb8.tar.bz2 | |
Merge "fix automatic timezone failing on some GSM networks" into ics
Diffstat (limited to 'telephony/java/com/android')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 21167a9..8e31e5a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -1356,8 +1356,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker { // As a special extension, the Android emulator appends the name of // the host computer's timezone to the nitz string. this is zoneinfo // timezone name of the form Area!Location or Area!Location!SubLocation - // so we need to convert the ! into / - if (nitzSubs.length >= 9) { + // so we need to convert the ! into /. If there's no "!", then maybe + // the carrier is appending something extra (as AT&T does) and it + // should be ignored + if ((nitzSubs.length >= 9) && (nitzSubs[8].indexOf('!') != -1)) { String tzname = nitzSubs[8].replace('!','/'); zone = TimeZone.getTimeZone( tzname ); } |