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

Commit 2c7af2ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix GNSS isSupported method Test: manually verified GNSSLogger can get... 

Merge "Fix GNSS isSupported method Test: manually verified GNSSLogger can get GNSS location and no longer popup to enable location when starting maps when location is enabled Bug:143677802"
parents c70a173a 24da7f97

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

+11 −8
Original line number Diff line number Diff line
@@ -589,9 +589,17 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 
        if (sStaticTestOverride) {

            return true;

        }

        ensureInitialized();

        return native_is_supported();

    }



    private static synchronized void ensureInitialized() {

        if (!sIsInitialized) {

            class_init_native();

        }

        sIsInitialized = true;

    }



    private void reloadGpsProperties() {

        mGnssConfiguration.reloadGpsProperties();

        setSuplHostPort();
@@ -610,12 +618,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 
            Looper looper) {

        super(context, locationProviderManager);



        synchronized (mLock) {

            if (!sIsInitialized) {

                class_init_native();

            }

            sIsInitialized = true;

        }

        ensureInitialized();



        mLooper = looper;