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

Commit 14d968bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent concurrent modification of battery history in tests" into udc-dev am: 5c6c5829 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21587265



Change-Id: Ie15908f42bf8735f86ce37b6b695b9adf07310f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1c836c4 5c6c5829

services/tests/servicestests/src/com/android/server/power/stats/MockBatteryStatsImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -231,6 +231,10 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl { 
        setExternalStatsSyncLocked(mExternalStatsSync);

    }



    @Override

    public void writeSyncLocked() {

    }



    public static class DummyExternalStatsSync implements ExternalStatsSync {

        public int flags = 0;