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

Commit 16b5a626 authored by Hongyi Zhang's avatar Hongyi Zhang Committed by Android (Google) Code Review
Browse files

Merge "Provide a BatteryStats interface noteCpuWakingBluetoothProxyPacket" into main

parents 3d39f609 1eccb9a6

services/core/java/android/os/BatteryStatsInternal.java

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public abstract class BatteryStatsInternal { 
    public static final int CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER = 3;

    public static final int CPU_WAKEUP_SUBSYSTEM_SENSOR = 4;

    public static final int CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA = 5;

    public static final int CPU_WAKEUP_SUBSYSTEM_BLUETOOTH = 6;



    /** @hide */

    @IntDef(prefix = {"CPU_WAKEUP_SUBSYSTEM_"}, value = {
@@ -50,6 +51,7 @@ public abstract class BatteryStatsInternal { 
            CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER,

            CPU_WAKEUP_SUBSYSTEM_SENSOR,

            CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA,

            CPU_WAKEUP_SUBSYSTEM_BLUETOOTH,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CpuWakeupSubsystem {
@@ -98,6 +100,14 @@ public abstract class BatteryStatsInternal { 
     */

    public abstract void noteCpuWakingNetworkPacket(Network network, long elapsedMillis, int uid);



    /**

     * Informs battery stats of a sysproxy packet that woke up the CPU

     *

     * @param uid The uid that received the packet.

     * @param elapsedMillis The time of the packet's arrival in elapsed timebase.

     */

    public abstract void noteCpuWakingBluetoothProxyPacket(int uid, long elapsedMillis);



    /**

     * Informs battery stats of binder stats for the given work source UID.

     */

services/core/java/com/android/server/am/BatteryStatsService.java

+11 −0
Original line number Diff line number Diff line
@@ -664,6 +664,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
            } else if (nc.hasTransport(TRANSPORT_CELLULAR)) {

                return CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA;

            }

            // For TRANSPORT_BLUETOOTH, we have a separate channel to catch Bluetooth wakeups.

            // See noteCpuWakingSysproxyPacket method.

            return CPU_WAKEUP_SUBSYSTEM_UNKNOWN;

        }
@@ -685,6 +687,15 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
            noteCpuWakingActivity(subsystem, elapsedMillis, uid);

        }



        @Override

        public void noteCpuWakingBluetoothProxyPacket(int uid, long elapsedMillis) {

            if (uid < 0) {

                Slog.e(TAG, "Invalid uid for waking bluetooth proxy packet: " + uid);

                return;

            }

            noteCpuWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH, elapsedMillis, uid);

        }



        @Override

        public void noteBinderCallStats(int workSourceUid, long incrementatCallCount,

                Collection<BinderCallsStats.CallStat> callStats) {

services/core/java/com/android/server/power/stats/wakeups/CpuWakeupStats.java

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.power.stats.wakeups;



import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_ALARM;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_BLUETOOTH;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_SENSOR;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER;
@@ -63,6 +64,7 @@ public class CpuWakeupStats { 
    private static final String SUBSYSTEM_SOUND_TRIGGER_STRING = "Sound_trigger";

    private static final String SUBSYSTEM_SENSOR_STRING = "Sensor";

    private static final String SUBSYSTEM_CELLULAR_DATA_STRING = "Cellular_data";

    private static final String SUBSYSTEM_BLUETOOTH_STRING = "Bluetooth";

    private static final String TRACE_TRACK_WAKEUP_ATTRIBUTION = "wakeup_attribution";



    private static final long WAKEUP_WRITE_DELAY_MS = TimeUnit.SECONDS.toMillis(30);
@@ -512,6 +514,8 @@ public class CpuWakeupStats { 
                return CPU_WAKEUP_SUBSYSTEM_SENSOR;

            case SUBSYSTEM_CELLULAR_DATA_STRING:

                return CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA;

            case SUBSYSTEM_BLUETOOTH_STRING:

                return CPU_WAKEUP_SUBSYSTEM_BLUETOOTH;

        }

        return CPU_WAKEUP_SUBSYSTEM_UNKNOWN;

    }
@@ -528,6 +532,8 @@ public class CpuWakeupStats { 
                return SUBSYSTEM_SENSOR_STRING;

            case CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA:

                return SUBSYSTEM_CELLULAR_DATA_STRING;

            case CPU_WAKEUP_SUBSYSTEM_BLUETOOTH:

                return SUBSYSTEM_BLUETOOTH_STRING;

            case CPU_WAKEUP_SUBSYSTEM_UNKNOWN:

                return "Unknown";

        }

services/tests/powerstatstests/res/xml/irq_device_map_3.xml

+3 −0
Original line number Diff line number Diff line
@@ -32,4 +32,7 @@ 
    <device name="test.sensor.device">

        <subsystem>Sensor</subsystem>

    </device>

    <device name="test.bluetooth.device">

        <subsystem>Bluetooth</subsystem>

    </device>

</irq-device-map>
 
 No newline at end of file

services/tests/powerstatstests/src/com/android/server/power/stats/wakeups/CpuWakeupStatsTest.java

+85 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.power.stats.wakeups;



import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_ALARM;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_BLUETOOTH;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_SENSOR;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER;
@@ -52,6 +53,7 @@ public class CpuWakeupStatsTest { 
    private static final String KERNEL_REASON_SOUND_TRIGGER_IRQ = "129 test.sound_trigger.device";

    private static final String KERNEL_REASON_SENSOR_IRQ = "15 test.sensor.device";

    private static final String KERNEL_REASON_CELLULAR_DATA_IRQ = "18 test.cellular_data.device";

    private static final String KERNEL_REASON_BLUETOOTH_IRQ = "19 test.bluetooth.device";

    private static final String KERNEL_REASON_UNKNOWN_IRQ = "140 test.unknown.device";

    private static final String KERNEL_REASON_UNKNOWN_FORMAT = "free-form-reason test.alarm.device";

    private static final String KERNEL_REASON_ALARM_ABNORMAL = "-1 test.alarm.device";
@@ -62,12 +64,14 @@ public class CpuWakeupStatsTest { 
    private static final int TEST_UID_3 = 92261423;

    private static final int TEST_UID_4 = 56926423;

    private static final int TEST_UID_5 = 76421423;

    private static final int TEST_UID_6 = 62345353;



    private static final int TEST_PROC_STATE_1 = 72331;

    private static final int TEST_PROC_STATE_2 = 792351;

    private static final int TEST_PROC_STATE_3 = 138831;

    private static final int TEST_PROC_STATE_4 = 23231;

    private static final int TEST_PROC_STATE_5 = 42;

    private static final int TEST_PROC_STATE_6 = 129942;



    private static final Context sContext = InstrumentationRegistry.getTargetContext();

    private final Handler mHandler = Mockito.mock(Handler.class);
@@ -79,6 +83,7 @@ public class CpuWakeupStatsTest { 
        obj.mUidProcStates.put(TEST_UID_3, TEST_PROC_STATE_3);

        obj.mUidProcStates.put(TEST_UID_4, TEST_PROC_STATE_4);

        obj.mUidProcStates.put(TEST_UID_5, TEST_PROC_STATE_5);

        obj.mUidProcStates.put(TEST_UID_6, TEST_PROC_STATE_6);

    }



    @Test
@@ -118,6 +123,7 @@ public class CpuWakeupStatsTest { 
                CPU_WAKEUP_SUBSYSTEM_SOUND_TRIGGER,

                CPU_WAKEUP_SUBSYSTEM_SENSOR,

                CPU_WAKEUP_SUBSYSTEM_CELLULAR_DATA,

                CPU_WAKEUP_SUBSYSTEM_BLUETOOTH,

        };



        final String[] kernelReasons = new String[] {
@@ -126,10 +132,11 @@ public class CpuWakeupStatsTest { 
                KERNEL_REASON_SOUND_TRIGGER_IRQ,

                KERNEL_REASON_SENSOR_IRQ,

                KERNEL_REASON_CELLULAR_DATA_IRQ,

                KERNEL_REASON_BLUETOOTH_IRQ,

        };



        final int[] uids = new int[] {

                TEST_UID_2, TEST_UID_3, TEST_UID_4, TEST_UID_1, TEST_UID_5

                TEST_UID_2, TEST_UID_3, TEST_UID_4, TEST_UID_1, TEST_UID_5, TEST_UID_6

        };



        final int[] procStates = new int[] {
@@ -137,7 +144,8 @@ public class CpuWakeupStatsTest { 
                TEST_PROC_STATE_3,

                TEST_PROC_STATE_4,

                TEST_PROC_STATE_1,

                TEST_PROC_STATE_5

                TEST_PROC_STATE_5,

                TEST_PROC_STATE_6

        };



        final int total = subsystems.length;
@@ -284,6 +292,40 @@ public class CpuWakeupStatsTest { 
                TEST_PROC_STATE_5);

    }



    @Test

    public void bluetoothIrqAttributionSolo() {

        final CpuWakeupStats obj = new CpuWakeupStats(sContext, R.xml.irq_device_map_3, mHandler);

        final long wakeupTime = 1236121;



        populateDefaultProcStates(obj);



        obj.noteWakeupTimeAndReason(wakeupTime, 1, KERNEL_REASON_BLUETOOTH_IRQ);



        // Outside the window, so should be ignored.

        obj.noteWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH,

                wakeupTime - obj.mConfig.WAKEUP_MATCHING_WINDOW_MS - 1, TEST_UID_1);

        obj.noteWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH,

                wakeupTime + obj.mConfig.WAKEUP_MATCHING_WINDOW_MS + 1, TEST_UID_2);

        // Should be attributed

        obj.noteWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH, wakeupTime + 5, TEST_UID_3,

                TEST_UID_5);



        final SparseArray<SparseIntArray> attribution = obj.mWakeupAttribution.get(wakeupTime);

        assertThat(attribution).isNotNull();

        assertThat(attribution.size()).isEqualTo(1);

        assertThat(attribution.contains(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH)).isTrue();

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).indexOfKey(

                TEST_UID_1)).isLessThan(0);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).indexOfKey(

                TEST_UID_2)).isLessThan(0);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).get(TEST_UID_3)).isEqualTo(

                TEST_PROC_STATE_3);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).indexOfKey(

                TEST_UID_4)).isLessThan(0);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).get(TEST_UID_5)).isEqualTo(

                TEST_PROC_STATE_5);

    }



    @Test

    public void alarmAndWifiIrqAttribution() {

        final CpuWakeupStats obj = new CpuWakeupStats(sContext, R.xml.irq_device_map_3, mHandler);
@@ -399,6 +441,47 @@ public class CpuWakeupStatsTest { 
        assertThat(attribution.contains(CPU_WAKEUP_SUBSYSTEM_ALARM)).isFalse();

    }



    @Test

    public void unknownAndBluetoothAttribution() {

        final CpuWakeupStats obj = new CpuWakeupStats(sContext, R.xml.irq_device_map_3, mHandler);

        final long wakeupTime = 92123520;



        populateDefaultProcStates(obj);



        obj.noteWakeupTimeAndReason(wakeupTime, 24,

                KERNEL_REASON_UNKNOWN_IRQ + ":" + KERNEL_REASON_BLUETOOTH_IRQ);



        // Bluetooth activity

        // Outside the window, so should be ignored.

        obj.noteWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH,

                wakeupTime - obj.mConfig.WAKEUP_MATCHING_WINDOW_MS - 1, TEST_UID_4);

        // Should be attributed

        obj.noteWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH, wakeupTime + 2, TEST_UID_1);

        obj.noteWakingActivity(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH, wakeupTime - 1, TEST_UID_3,

                TEST_UID_5);



        // Unrelated, should be ignored.

        obj.noteWakingActivity(CPU_WAKEUP_SUBSYSTEM_ALARM, wakeupTime + 5, TEST_UID_3);



        final SparseArray<SparseIntArray> attribution = obj.mWakeupAttribution.get(wakeupTime);

        assertThat(attribution).isNotNull();

        assertThat(attribution.size()).isEqualTo(2);

        assertThat(attribution.contains(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH)).isTrue();

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).get(TEST_UID_1)).isEqualTo(

                TEST_PROC_STATE_1);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH)

                .indexOfKey(TEST_UID_2)).isLessThan(0);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).get(TEST_UID_3)).isEqualTo(

                TEST_PROC_STATE_3);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH)

                .indexOfKey(TEST_UID_4)).isLessThan(0);

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_BLUETOOTH).get(TEST_UID_5)).isEqualTo(

                TEST_PROC_STATE_5);

        assertThat(attribution.contains(CPU_WAKEUP_SUBSYSTEM_UNKNOWN)).isTrue();

        assertThat(attribution.get(CPU_WAKEUP_SUBSYSTEM_UNKNOWN)).isNull();

        assertThat(attribution.contains(CPU_WAKEUP_SUBSYSTEM_ALARM)).isFalse();

    }



    @Test

    public void unknownFormatWakeupIgnored() {

        final CpuWakeupStats obj = new CpuWakeupStats(sContext, R.xml.irq_device_map_3, mHandler);