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

Commit 0c76f15c authored by Anil Admal's avatar Anil Admal
Browse files

Merge partner fix for ComprehensiveCountryDetector deadlock 

The fix is in comment #1 in b/70679249

Bug: 70679249
Test: Code inspection. Existing tests pass.
Change-Id: I4a195239da2f5b82e273cb259bea1c9c79dc4d52
parent 20a2484e

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 {