Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-04-25 22:43:34 +00:00
committed by Android (Google) Code Review

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