Merge "Fix issue #31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev (534a17e9) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -10727,7 +10727,7 @@ public class BatteryStatsImpl extends BatteryStats {
		}

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

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

		int NJ = in.readInt();
		if (NJ > 100) {
		if (NJ > (MAX_WAKELOCKS_PER_UID+1)) {
		throw new ParcelFormatException("File corrupt: too many job timers " + NJ);
		}
		for (int ij = 0; ij < NJ; ij++) {