commit ce54a0eb936bc26fc56e6bf15758886207cb0e54
author gitbuildkicker <android-build@google.com> Sun Oct 09 00:07:13 2016 -0700
committer gitbuildkicker <android-build@google.com> Sun Oct 09 00:07:13 2016 -0700
tree 9180534418f5aac89bec6735bb1d18bf76a4327f
parent 5185d1989c93faa3ce4b4410ef49a0205f43b239
parent aef6b8c4e1ed155a5aebc186b057a9e8e8e9ae27

merge in nyc-mr1-release history after reset to nyc-mr1-dev

src/com/android/bluetooth/gatt/ScanManager.java

diff --git a/src/com/android/bluetooth/gatt/ScanManager.java b/src/com/android/bluetooth/gatt/ScanManager.java
index 5eb31e1..7dceb28 100644
--- a/src/com/android/bluetooth/gatt/ScanManager.java
+++ b/src/com/android/bluetooth/gatt/ScanManager.java
@@ -253,10 +253,6 @@
             if (client == null) return;
 
             if (mRegularScanClients.contains(client)) {
-                // The ScanClient passed in just holds the clientIf. We retrieve the real client,
-                // which may have workSource set.
-                client = mScanNative.getRegularScanClient(client.clientIf);
-                if (client == null) return;
 
                 mScanNative.stopRegularScan(client);
 
@@ -270,7 +266,11 @@
 
                 // Update BatteryStats with this workload.
                 try {
-                    mBatteryStats.noteBleScanStopped(client.workSource);
+                    // The ScanClient passed in just holds the clientIf. We retrieve the real client,
+                    // which may have workSource set.
+                    ScanClient workClient = mScanNative.getRegularScanClient(client.clientIf);
+                    if (workClient != null)
+                        mBatteryStats.noteBleScanStopped(workClient.workSource);
                 } catch (RemoteException e) {
                     /* ignore */
                 }