commit 1354d26992e127a147e3383c129d9ae9173e78d9
author Narayan Kamath <narayan@google.com> Thu Dec 28 15:48:07 2017 +0000
committer Narayan Kamath <narayan@google.com> Thu Jan 04 14:18:22 2018 +0000
tree 16165fa31626c1f6e07518c72004f51687562375
parent af039aac14403e514ec4bf9ab4597765e75cada1

BatteryStats: Add WorkChain support for WiFi events.

The changes are straightforward, the only change outside of BatteryStats
is to use the new WorkSource.isEmpty API to account for WorkChains in a
given WorkSource.

Bug: 62390666
Test: BatteryStatsBackgroundStatsTest, BatteryStatsNoteTest, WifiLockManagerTest
Change-Id: I1dff43b6f2a09877e3af4442bfe8a8fd80b1ba74

framework/java/android/bluetooth/le/BluetoothLeScanner.java

diff --git a/framework/java/android/bluetooth/le/BluetoothLeScanner.java b/framework/java/android/bluetooth/le/BluetoothLeScanner.java
index a189e27..347fc4d 100644
--- a/framework/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/framework/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -387,7 +387,7 @@
                 if (mScannerId > 0) {
                     mLeScanClients.put(mScanCallback, this);
                 } else {
-                    // Registration timed out or got exception, reset scannerId to -1 so no
+                    // Registration timed out or got exception, reset RscannerId to -1 so no
                     // subsequent operations can proceed.
                     if (mScannerId == 0) mScannerId = -1;