Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0aedc3b authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "fix automatic timezone failing on some GSM networks" into ics

parents 8239114f 0219defc

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+4 −2
Original line number Diff line number Diff line
@@ -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 );

            }