Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ebc064c authored by Bookatz's avatar Bookatz
Browse files

Batterystats BLE results counter takes in count 

There would likely be too many BLE scan result calls for batterystats to
be healthy. Therefore, the caller can supply a count by which to increase the
counter, instead of doing it one result at a time.

Bug: 37720787
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: Ib8b2e8d250036be24c6c3dac477bc8d34fe498a6
parent 19af4cc3

core/java/com/android/internal/app/IBatteryStats.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/com/android/internal/os/BatteryStatsImpl.java

+8 −4
Original line number Diff line number Diff line
@@ -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

core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java

+4 −4
Original line number Diff line number Diff line
@@ -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));

    }

services/core/java/com/android/server/am/BatteryStatsService.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }