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

Fix Array Index Out of Bounds in BatteryStatsImpl

Browse Source 
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.

Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
This commit is contained in:
Adam Lesinski
2015-09-21 16:54:52 -07:00
parent 88f92ec5a7
commit 52290c9c4f
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8044,6 +8044,10 @@ public final class BatteryStatsImpl extends BatteryStats {
* wakelocks. If the screen is on, we just assign the actual cpu time an app used.
*/
public void updateCpuTimeLocked() {
if (mPowerProfile == null) {
return;
}
if (DEBUG_ENERGY_CPU) {
Slog.d(TAG, "!Cpu updating!");
}
@@ -8131,14 +8135,19 @@ public final class BatteryStatsImpl extends BatteryStats {
// Add the cpu speeds to this UID. These are used as a ratio
// for computing the power this UID used.
if (u.mCpuClusterSpeed == null) {
u.mCpuClusterSpeed = new LongSamplingCounter[clusterSpeeds.length][];
final int numClusters = mPowerProfile.getNumCpuClusters();
if (u.mCpuClusterSpeed == null || u.mCpuClusterSpeed.length !=
numClusters) {
u.mCpuClusterSpeed = new LongSamplingCounter[numClusters][];
}
for (int cluster = 0; cluster < clusterSpeeds.length; cluster++) {
if (u.mCpuClusterSpeed[cluster] == null) {
final int speedsInCluster = mPowerProfile.getNumSpeedStepsInCpuCluster(
cluster);
if (u.mCpuClusterSpeed[cluster] == null || speedsInCluster !=
u.mCpuClusterSpeed[cluster].length) {
u.mCpuClusterSpeed[cluster] =
new LongSamplingCounter[clusterSpeeds[cluster].length];
new LongSamplingCounter[speedsInCluster];
}
final LongSamplingCounter[] cpuSpeeds = u.mCpuClusterSpeed[cluster];