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

Fix issue #31305336: File corrupt: too many wake locks 101

Browse Source 
The limit is MAX_WAKELOCKS_PER_UID+1, since OverflowArrayMap
will add one more to contain the overflow.

Change-Id: I53004582daa0c405427308816728f2c1d2bef40d
This commit is contained in:
Dianne Hackborn
2016-10-03 17:00:02 -07:00
parent 99224b311c
commit cb99a72e62
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10727,7 +10727,7 @@ public class BatteryStatsImpl extends BatteryStats {
} }
int NW = in.readInt(); int NW = in.readInt();
if (NW > 100) { if (NW > (MAX_WAKELOCKS_PER_UID+1)) {
throw new ParcelFormatException("File corrupt: too many wake locks " + NW); throw new ParcelFormatException("File corrupt: too many wake locks " + NW);
} }
for (int iw = 0; iw < NW; iw++) { for (int iw = 0; iw < NW; iw++) {
@@ -10736,7 +10736,7 @@ public class BatteryStatsImpl extends BatteryStats {
} }
int NS = in.readInt(); int NS = in.readInt();
if (NS > 100) { if (NS > (MAX_WAKELOCKS_PER_UID+1)) {
throw new ParcelFormatException("File corrupt: too many syncs " + NS); throw new ParcelFormatException("File corrupt: too many syncs " + NS);
} }
for (int is = 0; is < NS; is++) { for (int is = 0; is < NS; is++) {
@@ -10745,7 +10745,7 @@ public class BatteryStatsImpl extends BatteryStats {
} }
int NJ = in.readInt(); int NJ = in.readInt();
if (NJ > 100) { if (NJ > (MAX_WAKELOCKS_PER_UID+1)) {
throw new ParcelFormatException("File corrupt: too many job timers " + NJ); throw new ParcelFormatException("File corrupt: too many job timers " + NJ);
} }
for (int ij = 0; ij < NJ; ij++) { for (int ij = 0; ij < NJ; ij++) {