summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-03-25 14:41:05 -0700
committerDianne Hackborn <hackbod@google.com>2014-04-03 11:20:15 -0700
commitef640cdfb29caf9d0abf4aba020afbc3eb3e0443 (patch)
tree650a0d9c00e4bca604a44bd9557e5f94b9da47c5 /core
parent9316082809196acd126a1e502d4b26d7b5f98216 (diff)
downloadframeworks_base-ef640cdfb29caf9d0abf4aba020afbc3eb3e0443.zip
frameworks_base-ef640cdfb29caf9d0abf4aba020afbc3eb3e0443.tar.gz
frameworks_base-ef640cdfb29caf9d0abf4aba020afbc3eb3e0443.tar.bz2
Don't allow -1 uids for wake locks.
Change-Id: Ia1b412a166f69247be3b047138349e7b4031bd7d
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 39636fe..4c11fa9 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -574,6 +574,7 @@ public final class BatteryStatsImpl extends BatteryStats {
mUptime = in.readLong();
mPastUptime = in.readLong();
mUptimeStart = in.readLong();
+ mRealtime = in.readLong();
mPastRealtime = in.readLong();
mRealtimeStart = in.readLong();
mUnpluggedUptime = in.readLong();
@@ -586,6 +587,7 @@ public final class BatteryStatsImpl extends BatteryStats {
out.writeLong(mUptime);
out.writeLong(runningUptime);
out.writeLong(mUptimeStart);
+ out.writeLong(mRealtime);
out.writeLong(runningRealtime);
out.writeLong(mRealtimeStart);
out.writeLong(mUnpluggedUptime);