Merge "addModemTxPowerToHistory() made synchronized"

diff --combined core/java/com/android/internal/os/BatteryStatsImpl.java
index 261d89f,fdb9756..242f422
--- 1/core/java/com/android/internal/os/BatteryStatsImpl.java
--- 2/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@@ -11597,7 -11597,7 +11597,7 @@@ public class BatteryStatsImpl extends B
       * time at the highest power level.
       * @param activityInfo
       */
-     private void addModemTxPowerToHistory(final ModemActivityInfo activityInfo) {
+     private synchronized void addModemTxPowerToHistory(final ModemActivityInfo activityInfo) {
          if (activityInfo == null) {
              return;
          }
@@@ -13348,7 -13348,7 +13348,7 @@@
  
          private static final boolean DEFAULT_TRACK_CPU_TIMES_BY_PROC_STATE = true;
          private static final boolean DEFAULT_TRACK_CPU_ACTIVE_CLUSTER_TIME = true;
 -        private static final boolean DEFAULT_READ_BINARY_CPU_TIME = false;
 +        private static final boolean DEFAULT_READ_BINARY_CPU_TIME = true;
          private static final long DEFAULT_PROC_STATE_CPU_TIMES_READ_DELAY_MS = 5_000;
          private static final long DEFAULT_KERNEL_UID_READERS_THROTTLE_TIME = 10_000;