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

Commit e87126e8 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev 

* commit '8a179cab':
  BatteryStats: Output per-app wifi controller distribution
parents 2da36fb3 8a179cab

core/java/android/os/BatteryStats.java

+32 −10
Original line number Diff line number Diff line
@@ -3282,6 +3282,7 @@ public abstract class BatteryStats implements Parcelable { 
        final long wifiIdleTimeMs = getWifiControllerActivity(CONTROLLER_IDLE_TIME, which);

        final long wifiRxTimeMs = getWifiControllerActivity(CONTROLLER_RX_TIME, which);

        final long wifiTxTimeMs = getWifiControllerActivity(CONTROLLER_TX_TIME, which);

        final long wifiPowerDrainMaMs = getWifiControllerActivity(CONTROLLER_POWER_DRAIN, which);

        final long wifiTotalTimeMs = wifiIdleTimeMs + wifiRxTimeMs + wifiTxTimeMs;



        sb.setLength(0);
@@ -3310,8 +3311,8 @@ public abstract class BatteryStats implements Parcelable { 


        sb.setLength(0);

        sb.append(prefix);

        sb.append("  WiFi Power drain: ").append(BatteryStatsHelper.makemAh(

                getWifiControllerActivity(CONTROLLER_POWER_DRAIN, which) / (double)(1000*60*60)));

        sb.append("  WiFi Power drain: ").append(

                BatteryStatsHelper.makemAh(wifiPowerDrainMaMs / (double) (1000*60*60)));

        sb.append("mAh");

        pw.println(sb.toString());
@@ -3656,6 +3657,27 @@ public abstract class BatteryStats implements Parcelable { 
                pw.println(sb.toString());

            }



            final long uidWifiIdleTimeMs = u.getWifiControllerActivity(CONTROLLER_IDLE_TIME, which);

            final long uidWifiRxTimeMs = u.getWifiControllerActivity(CONTROLLER_RX_TIME, which);

            final long uidWifiTxTimeMs = u.getWifiControllerActivity(CONTROLLER_TX_TIME, which);

            final long uidWifiTotalTimeMs = uidWifiIdleTimeMs + uidWifiRxTimeMs + uidWifiTxTimeMs;

            if (uidWifiTotalTimeMs > 0) {

                sb.setLength(0);

                sb.append(prefix).append("    WiFi Idle time: ");

                formatTimeMs(sb, uidWifiIdleTimeMs);

                sb.append("(").append(formatRatioLocked(uidWifiIdleTimeMs, uidWifiTotalTimeMs))

                        .append(")\n");



                sb.append(prefix).append("    WiFi Rx time:   "); formatTimeMs(sb, uidWifiRxTimeMs);

                sb.append("(").append(formatRatioLocked(uidWifiRxTimeMs, uidWifiTotalTimeMs))

                        .append(")\n");



                sb.append(prefix).append("    WiFi Tx time:   "); formatTimeMs(sb, uidWifiTxTimeMs);

                sb.append("(").append(formatRatioLocked(uidWifiTxTimeMs, uidWifiTotalTimeMs))

                        .append(")");

                pw.println(sb.toString());

            }



            if (u.hasUserActivity()) {

                boolean hasData = false;

                for (int i=0; i<Uid.NUM_USER_ACTIVITY_TYPES; i++) {