diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-03-13 09:50:24 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-03-13 09:50:24 -0700 |
| commit | bbb7472b8e378a46a1e77747265c19d22bd6968c (patch) | |
| tree | adaeb3af3ae530073c15154f22a98fabd200a27b /core/java | |
| parent | a7124cdd83723027f5880fa96f0c285a7615f3fa (diff) | |
| download | frameworks_base-bbb7472b8e378a46a1e77747265c19d22bd6968c.zip frameworks_base-bbb7472b8e378a46a1e77747265c19d22bd6968c.tar.gz frameworks_base-bbb7472b8e378a46a1e77747265c19d22bd6968c.tar.bz2 | |
Fix some uid issues in battery stats.
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 10fd2f0..26d7f5f 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -270,7 +270,6 @@ public final class BatteryStatsImpl extends BatteryStats { boolean mWifiOn; StopwatchTimer mWifiOnTimer; - int mWifiOnUid = -1; boolean mGlobalWifiRunning; StopwatchTimer mGlobalWifiRunningTimer; @@ -2912,10 +2911,6 @@ public final class BatteryStatsImpl extends BatteryStats { mWifiOn = false; mWifiOnTimer.stopRunningLocked(elapsedRealtime); } - if (mWifiOnUid >= 0) { - getUidStatsLocked(mWifiOnUid).noteWifiStoppedLocked(elapsedRealtime); - mWifiOnUid = -1; - } } public void noteAudioOnLocked(int uid) { @@ -5973,7 +5968,7 @@ public final class BatteryStatsImpl extends BatteryStats { if (entry.rxBytes == 0 || entry.txBytes == 0) continue; - final Uid u = getUidStatsLocked(entry.uid); + final Uid u = getUidStatsLocked(mapUid(entry.uid)); u.noteNetworkActivityLocked(NETWORK_MOBILE_RX_DATA, entry.rxBytes, entry.rxPackets); u.noteNetworkActivityLocked(NETWORK_MOBILE_TX_DATA, entry.txBytes, @@ -6040,7 +6035,7 @@ public final class BatteryStatsImpl extends BatteryStats { if (entry.rxBytes == 0 || entry.txBytes == 0) continue; - final Uid u = getUidStatsLocked(entry.uid); + final Uid u = getUidStatsLocked(mapUid(entry.uid)); u.noteNetworkActivityLocked(NETWORK_WIFI_RX_DATA, entry.rxBytes, entry.rxPackets); u.noteNetworkActivityLocked(NETWORK_WIFI_TX_DATA, entry.txBytes, @@ -6240,6 +6235,7 @@ public final class BatteryStatsImpl extends BatteryStats { * if needed. */ public Uid.Proc getProcessStatsLocked(int uid, String name) { + uid = mapUid(uid); Uid u = getUidStatsLocked(uid); return u.getProcessStatsLocked(name); } @@ -6249,6 +6245,7 @@ public final class BatteryStatsImpl extends BatteryStats { * if needed. */ public Uid.Pkg getPackageStatsLocked(int uid, String pkg) { + uid = mapUid(uid); Uid u = getUidStatsLocked(uid); return u.getPackageStatsLocked(pkg); } @@ -6258,6 +6255,7 @@ public final class BatteryStatsImpl extends BatteryStats { * if needed. */ public Uid.Pkg.Serv getServiceStatsLocked(int uid, String pkg, String name) { + uid = mapUid(uid); Uid u = getUidStatsLocked(uid); return u.getServiceStatsLocked(pkg, name); } |