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

Commit ba0cdb85 authored by Anil Admal's avatar Anil Admal Committed by Android (Google) Code Review
Browse files

Merge "Merge partner fix for ComprehensiveCountryDetector deadlock"

parents b5cc21e0 0c76f15c

services/core/java/com/android/server/location/LocationBasedCountryDetector.java

+4 −7
Original line number Diff line number Diff line
@@ -235,18 +235,15 @@ public class LocationBasedCountryDetector extends CountryDetectorBase { 
     * Start a new thread to query the country from Geocoder.

     */

    private synchronized void queryCountryCode(final Location location) {

        if (location == null) {

            notifyListener(null);

            return;

        }

        if (mQueryThread != null) return;

        mQueryThread = new Thread(new Runnable() {

            @Override

            public void run() {

                String countryIso = null;

                if (location != null) {

                    countryIso = getCountryFromLocation(location);

                if (location == null) {

                    notifyListener(null);

                    return;

                }

                String countryIso = getCountryFromLocation(location);

                if (countryIso != null) {

                    mDetectedCountry = new Country(countryIso, Country.COUNTRY_SOURCE_LOCATION);

                } else {