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

am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev

Browse Source 
* commit 'ffc6ce000568c08a50f7b538bd4cd7729e64c229':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary
This commit is contained in:
Adam Lesinski
2015-09-29 23:30:27 +00:00
committed by Android Git Automerger
parent 3de2d53a75 ffc6ce0005
commit 8197e2de06
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5704,6 +5704,8 @@ public final class BatteryStatsImpl extends BatteryStats {
cpuSpeeds[speed] = new LongSamplingCounter(mOnBatteryTimeBase, in); cpuSpeeds[speed] = new LongSamplingCounter(mOnBatteryTimeBase, in);
} }
} }
} else {
mCpuClusterSpeed[cluster] = null;
} }
} }
} else { } else {
@@ -9382,13 +9384,14 @@ public final class BatteryStatsImpl extends BatteryStats {
u.mCpuClusterSpeed = new LongSamplingCounter[numClusters][]; u.mCpuClusterSpeed = new LongSamplingCounter[numClusters][];
for (int cluster = 0; cluster < numClusters; cluster++) { for (int cluster = 0; cluster < numClusters; cluster++) {
int NSB = in.readInt(); if (in.readInt() != 0) {
final int NSB = in.readInt();
if (mPowerProfile != null && if (mPowerProfile != null &&
mPowerProfile.getNumSpeedStepsInCpuCluster(cluster) != NSB) { mPowerProfile.getNumSpeedStepsInCpuCluster(cluster) != NSB) {
throw new ParcelFormatException("File corrupt: too many speed bins " + NSB); throw new ParcelFormatException("File corrupt: too many speed bins " +
NSB);
} }
if (in.readInt() != 0) {
u.mCpuClusterSpeed[cluster] = new LongSamplingCounter[NSB]; u.mCpuClusterSpeed[cluster] = new LongSamplingCounter[NSB];
for (int speed = 0; speed < NSB; speed++) { for (int speed = 0; speed < NSB; speed++) {
if (in.readInt() != 0) { if (in.readInt() != 0) {
@@ -9397,6 +9400,8 @@ public final class BatteryStatsImpl extends BatteryStats {
u.mCpuClusterSpeed[cluster][speed].readSummaryFromParcelLocked(in); u.mCpuClusterSpeed[cluster][speed].readSummaryFromParcelLocked(in);
} }
} }
} else {
u.mCpuClusterSpeed[cluster] = null;
} }
} }
} else { } else {