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

Commit 03f3cb08 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 1f377298 to master 

Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
parents 511f66d3 1f377298

core/java/android/os/BatteryStats.java

+16 −16
Original line number Original line Diff line number Diff line
@@ -56,9 +56,9 @@ public abstract class BatteryStats implements Parcelable { 
    public static final int SENSOR = 3;

    public static final int SENSOR = 3;

    

    

    /**

    /**

     * A constant indicating a a wifi turn on timer

     * A constant indicating a a wifi running timer

     */

     */

    public static final int WIFI_TURNED_ON = 4;

    public static final int WIFI_RUNNING = 4;

    

    

    /**

    /**

     * A constant indicating a full wifi lock timer

     * A constant indicating a full wifi lock timer
@@ -249,8 +249,8 @@ public abstract class BatteryStats implements Parcelable { 
         */

         */

        public abstract long getTcpBytesSent(int which);

        public abstract long getTcpBytesSent(int which);

        

        

        public abstract void noteWifiTurnedOnLocked();

        public abstract void noteWifiRunningLocked();

        public abstract void noteWifiTurnedOffLocked();

        public abstract void noteWifiStoppedLocked();

        public abstract void noteFullWifiLockAcquiredLocked();

        public abstract void noteFullWifiLockAcquiredLocked();

        public abstract void noteFullWifiLockReleasedLocked();

        public abstract void noteFullWifiLockReleasedLocked();

        public abstract void noteScanWifiLockAcquiredLocked();

        public abstract void noteScanWifiLockAcquiredLocked();
@@ -261,7 +261,7 @@ public abstract class BatteryStats implements Parcelable { 
        public abstract void noteAudioTurnedOffLocked();

        public abstract void noteAudioTurnedOffLocked();

        public abstract void noteVideoTurnedOnLocked();

        public abstract void noteVideoTurnedOnLocked();

        public abstract void noteVideoTurnedOffLocked();

        public abstract void noteVideoTurnedOffLocked();

        public abstract long getWifiTurnedOnTime(long batteryRealtime, int which);

        public abstract long getWifiRunningTime(long batteryRealtime, int which);

        public abstract long getFullWifiLockTime(long batteryRealtime, int which);

        public abstract long getFullWifiLockTime(long batteryRealtime, int which);

        public abstract long getScanWifiLockTime(long batteryRealtime, int which);

        public abstract long getScanWifiLockTime(long batteryRealtime, int which);

        public abstract long getWifiMulticastTime(long batteryRealtime,

        public abstract long getWifiMulticastTime(long batteryRealtime,
@@ -701,7 +701,7 @@ public abstract class BatteryStats implements Parcelable { 
     *

     *

     * {@hide}

     * {@hide}

     */

     */

    public abstract long getWifiRunningTime(long batteryRealtime, int which);

    public abstract long getGlobalWifiRunningTime(long batteryRealtime, int which);





    /**

    /**

     * Returns the time in microseconds that bluetooth has been on while the device was

     * Returns the time in microseconds that bluetooth has been on while the device was
@@ -977,7 +977,7 @@ public abstract class BatteryStats implements Parcelable { 
        final long screenOnTime = getScreenOnTime(batteryRealtime, which);

        final long screenOnTime = getScreenOnTime(batteryRealtime, which);

        final long phoneOnTime = getPhoneOnTime(batteryRealtime, which);

        final long phoneOnTime = getPhoneOnTime(batteryRealtime, which);

        final long wifiOnTime = getWifiOnTime(batteryRealtime, which);

        final long wifiOnTime = getWifiOnTime(batteryRealtime, which);

        final long wifiRunningTime = getWifiRunningTime(batteryRealtime, which);

        final long wifiRunningTime = getGlobalWifiRunningTime(batteryRealtime, which);

        final long bluetoothOnTime = getBluetoothOnTime(batteryRealtime, which);

        final long bluetoothOnTime = getBluetoothOnTime(batteryRealtime, which);

       

       

        StringBuilder sb = new StringBuilder(128);

        StringBuilder sb = new StringBuilder(128);
@@ -1091,14 +1091,14 @@ public abstract class BatteryStats implements Parcelable { 
            long tx = u.getTcpBytesSent(which);

            long tx = u.getTcpBytesSent(which);

            long fullWifiLockOnTime = u.getFullWifiLockTime(batteryRealtime, which);

            long fullWifiLockOnTime = u.getFullWifiLockTime(batteryRealtime, which);

            long scanWifiLockOnTime = u.getScanWifiLockTime(batteryRealtime, which);

            long scanWifiLockOnTime = u.getScanWifiLockTime(batteryRealtime, which);

            long wifiTurnedOnTime = u.getWifiTurnedOnTime(batteryRealtime, which);

            long uidWifiRunningTime = u.getWifiRunningTime(batteryRealtime, which);

            

            

            if (rx > 0 || tx > 0) dumpLine(pw, uid, category, NETWORK_DATA, rx, tx);

            if (rx > 0 || tx > 0) dumpLine(pw, uid, category, NETWORK_DATA, rx, tx);

            

            

            if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0

            if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0

                    || wifiTurnedOnTime != 0) {

                    || uidWifiRunningTime != 0) {

                dumpLine(pw, uid, category, WIFI_LOCK_DATA, 

                dumpLine(pw, uid, category, WIFI_LOCK_DATA, 

                        fullWifiLockOnTime, scanWifiLockOnTime, wifiTurnedOnTime);

                        fullWifiLockOnTime, scanWifiLockOnTime, uidWifiRunningTime);

            }

            }





            if (u.hasUserActivity()) {

            if (u.hasUserActivity()) {
@@ -1240,7 +1240,7 @@ public abstract class BatteryStats implements Parcelable { 
        

        

        final long screenOnTime = getScreenOnTime(batteryRealtime, which);

        final long screenOnTime = getScreenOnTime(batteryRealtime, which);

        final long phoneOnTime = getPhoneOnTime(batteryRealtime, which);

        final long phoneOnTime = getPhoneOnTime(batteryRealtime, which);

        final long wifiRunningTime = getWifiRunningTime(batteryRealtime, which);

        final long wifiRunningTime = getGlobalWifiRunningTime(batteryRealtime, which);

        final long wifiOnTime = getWifiOnTime(batteryRealtime, which);

        final long wifiOnTime = getWifiOnTime(batteryRealtime, which);

        final long bluetoothOnTime = getBluetoothOnTime(batteryRealtime, which);

        final long bluetoothOnTime = getBluetoothOnTime(batteryRealtime, which);

        sb.setLength(0);

        sb.setLength(0);
@@ -1449,7 +1449,7 @@ public abstract class BatteryStats implements Parcelable { 
            long tcpSent = u.getTcpBytesSent(which);

            long tcpSent = u.getTcpBytesSent(which);

            long fullWifiLockOnTime = u.getFullWifiLockTime(batteryRealtime, which);

            long fullWifiLockOnTime = u.getFullWifiLockTime(batteryRealtime, which);

            long scanWifiLockOnTime = u.getScanWifiLockTime(batteryRealtime, which);

            long scanWifiLockOnTime = u.getScanWifiLockTime(batteryRealtime, which);

            long wifiTurnedOnTime = u.getWifiTurnedOnTime(batteryRealtime, which);

            long uidWifiRunningTime = u.getWifiRunningTime(batteryRealtime, which);

            

            

            if (tcpReceived != 0 || tcpSent != 0) {

            if (tcpReceived != 0 || tcpSent != 0) {

                pw.print(prefix); pw.print("    Network: ");

                pw.print(prefix); pw.print("    Network: ");
@@ -1480,11 +1480,11 @@ public abstract class BatteryStats implements Parcelable { 
            }

            }

            

            

            if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0

            if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0

                    || wifiTurnedOnTime != 0) {

                    || uidWifiRunningTime != 0) {

                sb.setLength(0);

                sb.setLength(0);

                sb.append(prefix); sb.append("    Turned Wifi On: "); 

                sb.append(prefix); sb.append("    Wifi Running: ");

                        formatTimeMs(sb, wifiTurnedOnTime / 1000); 

                        formatTimeMs(sb, uidWifiRunningTime / 1000);

                        sb.append("("); sb.append(formatRatioLocked(wifiTurnedOnTime, 

                        sb.append("("); sb.append(formatRatioLocked(uidWifiRunningTime,

                                whichBatteryRealtime)); sb.append(")\n");

                                whichBatteryRealtime)); sb.append(")\n");

                sb.append(prefix); sb.append("    Full Wifi Lock: "); 

                sb.append(prefix); sb.append("    Full Wifi Lock: "); 

                        formatTimeMs(sb, fullWifiLockOnTime / 1000); 

                        formatTimeMs(sb, fullWifiLockOnTime / 1000);

core/java/com/android/internal/app/IBatteryStats.aidl

+5 −4
Original line number Original line Diff line number Diff line
@@ -49,10 +49,11 @@ interface IBatteryStats { 
    void notePhoneSignalStrength(in SignalStrength signalStrength);

    void notePhoneSignalStrength(in SignalStrength signalStrength);

    void notePhoneDataConnectionState(int dataType, boolean hasData);

    void notePhoneDataConnectionState(int dataType, boolean hasData);

    void notePhoneState(int phoneState);

    void notePhoneState(int phoneState);

    void noteWifiOn(int uid);

    void noteWifiOn();

    void noteWifiOff(int uid);

    void noteWifiOff();

    void noteWifiRunning();

    void noteWifiRunning(in WorkSource ws);

    void noteWifiStopped();

    void noteWifiRunningChanged(in WorkSource oldWs, in WorkSource newWs);

    void noteWifiStopped(in WorkSource ws);

    void noteBluetoothOn();

    void noteBluetoothOn();

    void noteBluetoothOff();

    void noteBluetoothOff();

    void noteFullWifiLockAcquired(int uid);

    void noteFullWifiLockAcquired(int uid);