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

Commit 0d6e54e2 authored by Wyatt Riley's avatar Wyatt Riley
Browse files

Removing over-active NTP & XTRA assistance downloads 

Restoring pre-Connectivity-Manager intended behavior of only
pending-network NTP & XTRA downloads restarting when
network connectivity returns

Bug: 31864876
Fixes: 31864876

Change-Id: I5b967e75c610277988e8e9cfa1e938c999333edb
parent e8ebe112

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

+12 −5
Original line number Diff line number Diff line
@@ -452,9 +452,13 @@ public class GnssLocationProvider implements LocationProviderInterface { 
            new ConnectivityManager.NetworkCallback() {

        @Override

        public void onAvailable(Network network) {

            if (mInjectNtpTimePending == STATE_PENDING_NETWORK) {

                requestUtcTime();

            }

            if (mDownloadXtraDataPending == STATE_PENDING_NETWORK) {

                xtraDownloadRequest();

            }

        }

    };



    /**
@@ -1002,6 +1006,11 @@ public class GnssLocationProvider implements LocationProviderInterface { 
    }



    private void handleDownloadXtraData() {

        if (!mSupportsXtra) {

            // native code reports xtra not supported, don't try

            Log.d(TAG, "handleDownloadXtraData() called when Xtra not supported");

            return;

        }

        if (mDownloadXtraDataPending == STATE_DOWNLOADING) {

            // already downloading data

            return;
@@ -2125,9 +2134,7 @@ public class GnssLocationProvider implements LocationProviderInterface { 
                    handleInjectNtpTime();

                    break;

                case DOWNLOAD_XTRA_DATA:

                    if (mSupportsXtra) {

                    handleDownloadXtraData();

                    }

                    break;

                case INJECT_NTP_TIME_FINISHED:

                    mInjectNtpTimePending = STATE_IDLE;