commit 4561f90194a511d135bcb9645332f99fe42e053e
author Ian Pedowitz <ijpedowitz@google.com> Wed Feb 08 02:02:12 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 08 02:02:17 2017 +0000
tree e8da4e4e05f42ae340e67d839d30b77cace91211
parent 11015dd44641781fb494e1b49fe349fa2ab6adcb
parent d2450862f4e97de26dd350de7ec1d6ebbdb15224

Merge "Logging and partial fix for BatteryStats lock contention"

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

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 63622f1..9dca5ea 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -9562,7 +9562,8 @@
                     }
                 });
 
-        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 @@
             if (next == null) {
                 return;
             }
-
-            mWriteLock.lock();
         }
 
+        mWriteLock.lock();
         try {
             FileOutputStream stream = new FileOutputStream(mFile.chooseForWrite());
             stream.write(next.marshall());