Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not unparcel TimeInFreqMultiStateCounter with CPU freq count mismatch"

Browse Source
This commit is contained in:
Dmitri Plotnikov
2022-01-31 18:04:35 +00:00
committed by Android (Google) Code Review
parent 1825f77243 b8b9bf6f79
commit 5ae1bee477
1 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -2013,17 +2013,15 @@ public class BatteryStatsImpl extends BatteryStats {
private final TimeBase mTimeBase;
private final LongArrayMultiStateCounter mCounter;
private TimeInFreqMultiStateCounter(TimeBase timeBase, Parcel in, long timestampMs) {
mTimeBase = timeBase;
mCounter = LongArrayMultiStateCounter.CREATOR.createFromParcel(in);
mCounter.setEnabled(mTimeBase.isRunning(), timestampMs);
timeBase.add(this);
}
private TimeInFreqMultiStateCounter(TimeBase timeBase, int stateCount, int cpuFreqCount,
long timestampMs) {
this(timeBase, new LongArrayMultiStateCounter(stateCount, cpuFreqCount), timestampMs);
}
private TimeInFreqMultiStateCounter(TimeBase timeBase, LongArrayMultiStateCounter counter,
long timestampMs) {
mTimeBase = timeBase;
mCounter = new LongArrayMultiStateCounter(stateCount, cpuFreqCount);
mCounter = counter;
mCounter.setEnabled(mTimeBase.isRunning(), timestampMs);
timeBase.add(this);
}
@@ -2032,6 +2030,19 @@ public class BatteryStatsImpl extends BatteryStats {
mCounter.writeToParcel(out, 0);
}
@Nullable
private static TimeInFreqMultiStateCounter readFromParcel(Parcel in, TimeBase timeBase,
int stateCount, int cpuFreqCount, long timestampMs) {
// Read the object from the Parcel, whether it's usable or not
LongArrayMultiStateCounter counter =
LongArrayMultiStateCounter.CREATOR.createFromParcel(in);
if (counter.getStateCount() != stateCount
|| counter.getArrayLength() != cpuFreqCount) {
return null;
}
return new TimeInFreqMultiStateCounter(timeBase, counter, timestampMs);
}
@Override
public void onTimeStarted(long elapsedRealtimeUs, long baseUptimeUs, long baseRealtimeUs) {
mCounter.setEnabled(true, elapsedRealtimeUs / 1000);
@@ -10784,25 +10795,18 @@ public class BatteryStatsImpl extends BatteryStats {
stateCount = in.readInt();
if (stateCount != 0) {
// Read the object from the Parcel, whether it's usable or not
TimeInFreqMultiStateCounter counter = new TimeInFreqMultiStateCounter(
mBsi.mOnBatteryTimeBase, in, timestampMs);
if (stateCount == PROC_STATE_TIME_COUNTER_STATE_COUNT) {
mProcStateTimeMs = counter;
}
mProcStateTimeMs = TimeInFreqMultiStateCounter.readFromParcel(in,
mBsi.mOnBatteryTimeBase, PROC_STATE_TIME_COUNTER_STATE_COUNT,
mBsi.getCpuFreqCount(), mBsi.mClock.elapsedRealtime());
} else {
mProcStateTimeMs = null;
}
stateCount = in.readInt();
if (stateCount != 0) {
// Read the object from the Parcel, whether it's usable or not
TimeInFreqMultiStateCounter counter =
new TimeInFreqMultiStateCounter(
mBsi.mOnBatteryScreenOffTimeBase, in, timestampMs);
if (stateCount == PROC_STATE_TIME_COUNTER_STATE_COUNT) {
mProcStateScreenOffTimeMs = counter;
}
mProcStateScreenOffTimeMs = TimeInFreqMultiStateCounter.readFromParcel(in,
mBsi.mOnBatteryScreenOffTimeBase, PROC_STATE_TIME_COUNTER_STATE_COUNT,
mBsi.getCpuFreqCount(), mBsi.mClock.elapsedRealtime());
} else {
mProcStateScreenOffTimeMs = null;
}
@@ -17165,12 +17169,10 @@ public class BatteryStatsImpl extends BatteryStats {
stateCount = in.readInt();
if (stateCount != 0) {
// Read the object from the Parcel, whether it's usable or not
TimeInFreqMultiStateCounter counter = new TimeInFreqMultiStateCounter(
mOnBatteryTimeBase, in, mClock.elapsedRealtime());
if (stateCount == PROC_STATE_TIME_COUNTER_STATE_COUNT) {
u.mProcStateTimeMs = counter;
}
detachIfNotNull(u.mProcStateTimeMs);
u.mProcStateTimeMs = TimeInFreqMultiStateCounter.readFromParcel(in,
mOnBatteryTimeBase, PROC_STATE_TIME_COUNTER_STATE_COUNT,
getCpuFreqCount(), mClock.elapsedRealtime());
}
detachIfNotNull(u.mProcStateScreenOffTimeMs);
@@ -17179,13 +17181,9 @@ public class BatteryStatsImpl extends BatteryStats {
stateCount = in.readInt();
if (stateCount != 0) {
detachIfNotNull(u.mProcStateScreenOffTimeMs);
// Read the object from the Parcel, whether it's usable or not
TimeInFreqMultiStateCounter counter =
new TimeInFreqMultiStateCounter(
mOnBatteryScreenOffTimeBase, in, mClock.elapsedRealtime());
if (stateCount == PROC_STATE_TIME_COUNTER_STATE_COUNT) {
u.mProcStateScreenOffTimeMs = counter;
}
u.mProcStateScreenOffTimeMs = TimeInFreqMultiStateCounter.readFromParcel(in,
mOnBatteryScreenOffTimeBase, PROC_STATE_TIME_COUNTER_STATE_COUNT,
getCpuFreqCount(), mClock.elapsedRealtime());
}
if (in.readInt() != 0) {