Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge partner fix for ComprehensiveCountryDetector deadlock

Browse Source 
The fix is in comment #1 in b/70679249

Bug: 70679249
Test: Code inspection. Existing tests pass.
Change-Id: I4a195239da2f5b82e273cb259bea1c9c79dc4d52
This commit is contained in:
Anil Admal
2019-02-06 19:06:07 -08:00
parent 20a2484e58
commit 0c76f15cb2
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/location/LocationBasedCountryDetector.java
View File

@@ -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 {