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

Commit 4561f901 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge "Logging and partial fix for BatteryStats lock contention"

parents 11015dd4 d2450862

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

+3 −3
Original line number Diff line number Diff line
@@ -9562,7 +9562,8 @@ public class BatteryStatsImpl extends BatteryStats { 
                    }

                });



        if (DEBUG_ENERGY_CPU) {

        // TODO: STOPSHIP, remove the "true" below after b/34961340 is fixed

        if (DEBUG_ENERGY_CPU || true) {

            Slog.d(TAG, "Reading cpu stats took " + (mClocks.elapsedRealtime() - startTimeMs) +

                    " ms");

        }
@@ -10390,10 +10391,9 @@ public class BatteryStatsImpl extends BatteryStats { 
            if (next == null) {

                return;

            }



            mWriteLock.lock();

        }



        mWriteLock.lock();

        try {

            FileOutputStream stream = new FileOutputStream(mFile.chooseForWrite());

            stream.write(next.marshall());