PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8c94273c: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev

Browse Source 
* commit '8c94273c73480c35ee0af8910b32f0d4dec48132':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
This commit is contained in:
Dianne Hackborn
2013-04-10 14:16:34 -07:00
committed by Android Git Automerger
parent 8059d27e73 8c94273c73
commit 5d46a54c55
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -606,7 +606,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
app.tcpBytesSent = tcpBytesSent;
if (u.getUid() == Process.WIFI_UID) {
mWifiSippers.add(app);
} else if (u.getUid() == Process.BLUETOOTH_GID) {
} else if (u.getUid() == Process.BLUETOOTH_UID) {
mBluetoothSippers.add(app);
} else if (userId != UserHandle.myUserId()
&& UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
@@ -627,7 +627,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
if (power != 0) {
if (u.getUid() == Process.WIFI_UID) {
mWifiPower += power;
} else if (u.getUid() == Process.BLUETOOTH_GID) {
} else if (u.getUid() == Process.BLUETOOTH_UID) {
mBluetoothPower += power;
} else if (isOtherUser) {
Double userPower = mUserPower.get(userId);