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

Commit 7a90af49 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Simplify APIs exposed for time zone lookups" am: 2df8c250 am: 5ed0fcd1 

am: 7e5872cc

Change-Id: I287e3c96e27165ee6ea76b6d00ded28dfe945145
parents 2ea77b91 7e5872cc

src/java/com/android/internal/telephony/MccTable.java

+4 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.util.Slog; 
import com.android.internal.app.LocaleStore;

import com.android.internal.app.LocaleStore.LocaleInfo;



import libcore.timezone.CountryTimeZones;

import libcore.timezone.TimeZoneFinder;



import java.util.ArrayList;
@@ -96,7 +97,9 @@ public final class MccTable { 
            return null;

        }

        final String lowerCaseCountryCode = entry.mIso;

        return TimeZoneFinder.getInstance().lookupDefaultTimeZoneIdByCountry(lowerCaseCountryCode);

        CountryTimeZones countryTimeZones =

                TimeZoneFinder.getInstance().lookupCountryTimeZones(lowerCaseCountryCode);

        return countryTimeZones == null ? null : countryTimeZones.getDefaultTimeZoneId();

    }



    /**