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

Merge "Fix issue #13095629: Device is in restart mode for long time..."

Browse Source
This commit is contained in:
Dianne Hackborn
2014-02-19 18:57:50 +00:00
committed by Android (Google) Code Review
parent 66d792b663 00e2521d2a
commit b3f38c6398
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import android.bluetooth.BluetoothHeadset;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkStats;
import android.os.BadParcelableException;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.FileUtils;
@@ -86,7 +87,7 @@ public final class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
private static final int VERSION = 84 + (USE_OLD_HISTORY ? 1000 : 0);
private static final int VERSION = 85 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000;
@@ -6026,7 +6027,7 @@ public final class BatteryStatsImpl extends BatteryStats {
stream.close();
readSummaryFromParcel(in);
} catch(java.io.IOException e) {
} catch(Exception e) {
Slog.e("BatteryStats", "Error reading battery statistics", e);
}
@@ -6234,6 +6235,9 @@ public final class BatteryStatsImpl extends BatteryStats {
}
sNumSpeedSteps = in.readInt();
if (sNumSpeedSteps < 0 || sNumSpeedSteps > 100) {
throw new BadParcelableException("Bad speed steps in data: " + sNumSpeedSteps);
}
final int NU = in.readInt();
if (NU > 10000) {