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

Commit 7b80dcd6 authored by Chinmay Dhodapkar's avatar Chinmay Dhodapkar Committed by Automerger Merge Worker
Browse files

Merge "request location based country detector in WiFi ON" into sc-dev am: 08fe5faf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b3a26a5bdcd0031610a12f7539530eff455c902
parents e601fbaa 08fe5faf

services/core/java/com/android/server/location/countrydetector/ComprehensiveCountryDetector.java

+8 −1
Original line number Diff line number Diff line
@@ -320,13 +320,15 @@ public class ComprehensiveCountryDetector extends CountryDetectorBase { 
                        "(source: " + detectedCountry.getSource()

                        + ", countryISO: " + detectedCountry.getCountryIso() + ")")

                    + " isAirplaneModeOff()=" + isAirplaneModeOff()

                    + " isWifiOn()=" + isWifiOn()

                    + " mListener=" + mListener

                    + " isGeoCoderImplemnted()=" + isGeoCoderImplemented());

        }



        if (startLocationBasedDetection && (detectedCountry == null

                || detectedCountry.getSource() > Country.COUNTRY_SOURCE_LOCATION)

                && isAirplaneModeOff() && mListener != null && isGeoCoderImplemented()) {

                && (isAirplaneModeOff() || isWifiOn()) && mListener != null

                && isGeoCoderImplemented()) {

            if (DEBUG) Slog.d(TAG, "run startLocationBasedDetector()");

            // Start finding location when the source is less reliable than the

            // 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;

    }



    protected boolean isWifiOn() {

        return Settings.Global.getInt(

                mContext.getContentResolver(), Settings.Global.WIFI_ON, 0) != 0;

    }



    /**

     * Notify the country change.

     */