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

Commit 73b77f92 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Store binder thread CPU times in the summary parcel" into sc-dev am: 80efce1f 

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

Change-Id: I0fcb5b7b97a48e6e46de56e1366d60ba5b3ead7e
parents 537641ec 80efce1f

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

+6 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class BatteryStatsImpl extends BatteryStats { 
    private static final int MAGIC = 0xBA757475; // 'BATSTATS'















    // Current on-disk Parcel version













    static final int VERSION = 199;













    static final int VERSION = 200;





























    // The maximum number of names wakelocks we will keep track of















    // per uid; once the limit is reached, we batch the remaining wakelocks










@@ -15541,6 +15541,9 @@ public class BatteryStatsImpl extends BatteryStats {













                }















            }















        }

























        mBinderThreadCpuTimesUs =













                LongSamplingCounterArray.readSummaryFromParcelLocked(in, mOnBatteryTimeBase);















    }





























    /**










@@ -16065,6 +16068,8 @@ public class BatteryStatsImpl extends BatteryStats {













                }















            }















        }

























        LongSamplingCounterArray.writeSummaryToParcelLocked(out, mBinderThreadCpuTimesUs);















    }





























    public void readFromParcel(Parcel in) {