Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c94273c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents fdc5489b 1d675e65

src/com/android/settings/fuelgauge/PowerUsageSummary.java

+2 −2
Original line number Diff line number Diff line
@@ -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);