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

Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am: 75fb4d3021 am: fd2a632b1f

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

Change-Id: I272db018a2dc729670b676ef4e370bb446e465c1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-25 23:31:29 +00:00
committed by Automerger Merge Worker
parent 80c6433ed6 fd2a632b1f
commit 431c2f58ad
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java
View File

@@ -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();
} }