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

Commit a0bbba24 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am: 75fb4d30 am: 637ba3ac 

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



Change-Id: Icc72f7bb74dc5ee0b21b5538dd90d66b523efdb8
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 707527ac 637ba3ac

services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -158,6 +158,7 @@ public final class GnssMeasurementsProvider extends 
            Collection<GnssListenerRegistration> registrations) {

            Collection<GnssListenerRegistration> registrations) {

        boolean fullTracking = false;

        boolean fullTracking = false;

        boolean enableCorrVecOutputs = false;

        boolean enableCorrVecOutputs = false;

        int intervalMillis = Integer.MAX_VALUE;





        if (mSettingsHelper.isGnssMeasurementsFullTrackingEnabled()) {

        if (mSettingsHelper.isGnssMeasurementsFullTrackingEnabled()) {

            fullTracking = true;

            fullTracking = true;
@@ -171,11 +172,13 @@ public final class GnssMeasurementsProvider extends 
            if (request.isCorrelationVectorOutputsEnabled()) {

            if (request.isCorrelationVectorOutputsEnabled()) {

                enableCorrVecOutputs = true;

                enableCorrVecOutputs = true;

            }

            }

            intervalMillis = Math.min(intervalMillis, request.getIntervalMillis());

        }

        }





        return new GnssMeasurementRequest.Builder()

        return new GnssMeasurementRequest.Builder()

                    .setFullTracking(fullTracking)

                    .setFullTracking(fullTracking)

                    .setCorrelationVectorOutputsEnabled(enableCorrVecOutputs)

                    .setCorrelationVectorOutputsEnabled(enableCorrVecOutputs)

                    .setIntervalMillis(intervalMillis)

                    .build();

                    .build();

    }

    }