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

Merge "request location based country detector in WiFi ON" into sc-dev

Browse Source
This commit is contained in:
Chinmay Dhodapkar
2021-02-24 20:06:13 +00:00
committed by Android (Google) Code Review
parent babbd42dc2 3ba3c43faa
commit 08fe5faf25
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/location/countrydetector/ComprehensiveCountryDetector.java
View File

@@ -320,13 +320,15 @@ public class ComprehensiveCountryDetector extends CountryDetectorBase {
"(source: " + detectedCountry.getSource() "(source: " + detectedCountry.getSource()
+ ", countryISO: " + detectedCountry.getCountryIso() + ")") + ", countryISO: " + detectedCountry.getCountryIso() + ")")
+ " isAirplaneModeOff()=" + isAirplaneModeOff() + " isAirplaneModeOff()=" + isAirplaneModeOff()
+ " isWifiOn()=" + isWifiOn()
+ " mListener=" + mListener + " mListener=" + mListener
+ " isGeoCoderImplemnted()=" + isGeoCoderImplemented()); + " isGeoCoderImplemnted()=" + isGeoCoderImplemented());
} }
if (startLocationBasedDetection && (detectedCountry == null if (startLocationBasedDetection && (detectedCountry == null
|| detectedCountry.getSource() > Country.COUNTRY_SOURCE_LOCATION) || detectedCountry.getSource() > Country.COUNTRY_SOURCE_LOCATION)
&& isAirplaneModeOff() && mListener != null && isGeoCoderImplemented()) { && (isAirplaneModeOff() || isWifiOn()) && mListener != null
&& isGeoCoderImplemented()) {
if (DEBUG) Slog.d(TAG, "run startLocationBasedDetector()"); if (DEBUG) Slog.d(TAG, "run startLocationBasedDetector()");
// Start finding location when the source is less reliable than the // Start finding location when the source is less reliable than the
// location and the airplane mode is off (as geocoder will not // location and the airplane mode is off (as geocoder will not
@@ -387,6 +389,11 @@ public class ComprehensiveCountryDetector extends CountryDetectorBase {
mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) == 0; mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) == 0;
} }
protected boolean isWifiOn() {
return Settings.Global.getInt(
mContext.getContentResolver(), Settings.Global.WIFI_ON, 0) != 0;
}
/** /**
* Notify the country change. * Notify the country change.
*/ */