Log battery stats before ScanClient gets removed

Bug: 36977250
Test: run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest
Change-Id: I8b926b7eeb9bdd8b54c7655a4951d21e8dffddfc

diff --git a/src/com/android/bluetooth/gatt/ScanManager.java b/src/com/android/bluetooth/gatt/ScanManager.java
index b5b6df5..b7b64f0 100644 (file)
--- a/src/com/android/bluetooth/gatt/ScanManager.java
+++ b/src/com/android/bluetooth/gatt/ScanManager.java
@@ -269,6 +269,15 @@ public class ScanManager {
             if (client == null) return;
 
             if (mRegularScanClients.contains(client)) {
+                // Update BatteryStats with this workload.
+                try {
+                    // The ScanClient passed in just holds the scannerId. We retrieve the real
+                    // client, which may have workSource set.
+                    ScanClient workClient = mScanNative.getRegularScanClient(client.scannerId);
+                    if (workClient != null) mBatteryStats.noteBleScanStopped(workClient.workSource);
+                } catch (RemoteException e) {
+                    /* ignore */
+                }
 
                 mScanNative.stopRegularScan(client);
 
@@ -279,17 +288,6 @@ public class ScanManager {
                 if (!mScanNative.isOpportunisticScanClient(client)) {
                     mScanNative.configureRegularScanParams();
                 }
-
-                // Update BatteryStats with this workload.
-                try {
-                    // The ScanClient passed in just holds the scannerId. We retrieve the real client,
-                    // which may have workSource set.
-                    ScanClient workClient = mScanNative.getRegularScanClient(client.scannerId);
-                    if (workClient != null)
-                        mBatteryStats.noteBleScanStopped(workClient.workSource);
-                } catch (RemoteException e) {
-                    /* ignore */
-                }
             } else {
                 mScanNative.stopBatchScan(client);
             }