diff options
4 files changed, 15 insertions, 11 deletions
diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl index 373f4bb93e68..78566dfc458e 100644 --- a/core/java/com/android/internal/app/IBatteryStats.aidl +++ b/core/java/com/android/internal/app/IBatteryStats.aidl @@ -132,7 +132,7 @@ interface IBatteryStats { void noteBleScanStarted(in WorkSource ws); void noteBleScanStopped(in WorkSource ws); void noteResetBleScan(); - void noteBleScanResult(in WorkSource ws); + void noteBleScanResults(in WorkSource ws, int numNewResults); HealthStatsParceler takeUidSnapshot(int uid); HealthStatsParceler[] takeUidSnapshots(in int[] uid); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 6b185919d7f6..d3eb451d664a 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -929,6 +929,10 @@ public class BatteryStatsImpl extends BatteryStats { mCount.incrementAndGet(); } + void addAtomic(int delta) { + mCount.addAndGet(delta); + } + /** * Clear state of this counter. */ @@ -4704,11 +4708,11 @@ public class BatteryStatsImpl extends BatteryStats { } } - public void noteBluetoothScanResultFromSourceLocked(WorkSource ws) { + public void noteBluetoothScanResultsFromSourceLocked(WorkSource ws, int numNewResults) { final int N = ws.size(); for (int i = 0; i < N; i++) { int uid = mapUid(ws.get(i)); - getUidStatsLocked(uid).noteBluetoothScanResultLocked(); + getUidStatsLocked(uid).noteBluetoothScanResultsLocked(numNewResults); } } @@ -5880,8 +5884,8 @@ public class BatteryStatsImpl extends BatteryStats { return mBluetoothScanResultCounter; } - public void noteBluetoothScanResultLocked() { - createBluetoothScanResultCounterLocked().stepAtomic(); + public void noteBluetoothScanResultsLocked(int numNewResults) { + createBluetoothScanResultCounterLocked().addAtomic(numNewResults); } @Override diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java index 1dced75ae72c..e374e11b15f3 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java @@ -29,15 +29,15 @@ public class BatteryStatsNoteTest extends TestCase{ private static final int UID = 10500; private static final WorkSource WS = new WorkSource(UID); - /** Test that BatteryStatsImpl.Uid.noteBluetoothScanResultLocked. */ + /** Test that BatteryStatsImpl.Uid.noteBluetoothScanResultsLocked. */ @SmallTest public void testNoteBluetoothScanResultLocked() throws Exception { MockBatteryStatsImpl bi = new MockBatteryStatsImpl(new MockClocks()); bi.updateTimeBasesLocked(true, true, 0, 0); - bi.noteBluetoothScanResultFromSourceLocked(WS); - bi.noteBluetoothScanResultFromSourceLocked(WS); - assertEquals(2, + bi.noteBluetoothScanResultsFromSourceLocked(WS, 1); + bi.noteBluetoothScanResultsFromSourceLocked(WS, 100); + assertEquals(101, bi.getUidStats().get(UID).getBluetoothScanResultCounter() .getCountLocked(STATS_SINCE_CHARGED)); } diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 7a46248e07f9..11fc40b04734 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -966,10 +966,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub } @Override - public void noteBleScanResult(WorkSource ws) { + public void noteBleScanResults(WorkSource ws, int numNewResults) { enforceCallingPermission(); synchronized (mStats) { - mStats.noteBluetoothScanResultFromSourceLocked(ws); + mStats.noteBluetoothScanResultsFromSourceLocked(ws, numNewResults); } } |