From 146bb71f2f84aae6307771704c46261736ff755e Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Thu, 10 Mar 2022 14:59:45 -0800
Subject: [PATCH] Always flush batch before stopping

There doesn't seem to be any reason not to flush locations before
stopping a batch. This is extra location information that has been
collected anyways.

Test: presubmits
Change-Id: I058d9eeefcf70be55b035e4469eb729826ac28da
---
 .../com/android/server/location/gnss/GnssLocationProvider.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
index cd2ba393f6f22..8407a117be946 100644
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -1184,6 +1184,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
                 mAlarmManager.cancel(mBatchingAlarm);
                 mBatchingAlarm = null;
             }
+            mGnssNative.flushBatch();
             mGnssNative.stopBatch();
             mBatchingStarted = false;
         }