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

Commit e2e59df3 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Automerger Merge Worker
Browse files

Merge "Attributing and logging wifi wakeups" into udc-dev am: 219baef8 am: 6dea2880 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21686985



Change-Id: Id6b1fb0b1c29fc2f587fefa6cc7f98f20452fd57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bda0b6f 6dea2880

core/res/res/xml/irq_device_map.xml

+6 −5
Original line number Diff line number Diff line
@@ -17,14 +17,15 @@ 
*/

-->

<irq-device-map>

  <!--  This file maps devices (chips) that can send IRQs to the CPU (and bring it out of sleep) to

        logical subsystems in userspace code. Since each Android device has its own uniquely

        designed chipset, this mapping is expected to be empty by default and should be overridden

        by device specific configs.

  <!--  This file maps devices (chips) that can send interrupts to the main processor (and bring it

        out of sleep) to logical subsystems in userspace code. Since each Android device has its own

        uniquely designed chipset, this mapping is expected to be empty by default and should be

        overridden by device-specific configs.

        This mapping helps the system to meaningfully attribute CPU wakeups to logical work that

        happened on the device. The devices are referred to by their names as defined in the kernel.

        Currently defined subsystems are:

        Currently, defined subsystems are:

        - Alarm: Use this to denote wakeup alarms requested by apps via the AlarmManager API.

        - Wifi: Use this to denote network traffic that uses the wifi transport.



        The overlay should use tags <device> and <subsystem> to describe this mapping in the

        following way:

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

+2 −0
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ public abstract class BatteryStatsInternal { 


    public static final int CPU_WAKEUP_SUBSYSTEM_UNKNOWN = -1;

    public static final int CPU_WAKEUP_SUBSYSTEM_ALARM = 1;

    public static final int CPU_WAKEUP_SUBSYSTEM_WIFI = 2;



    /** @hide */

    @IntDef(prefix = {"CPU_WAKEUP_SUBSYSTEM_"}, value = {

            CPU_WAKEUP_SUBSYSTEM_UNKNOWN,

            CPU_WAKEUP_SUBSYSTEM_ALARM,

            CPU_WAKEUP_SUBSYSTEM_WIFI,

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface CpuWakeupSubsystem {

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

+22 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.Manifest.permission.NETWORK_STACK; 
import static android.Manifest.permission.POWER_SAVER;

import static android.Manifest.permission.UPDATE_DEVICE_STATS;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

import static android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK;

import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE;
@@ -479,9 +480,29 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
            BatteryStatsService.this.noteJobsDeferred(uid, numDeferred, sinceLast);

        }



        private int transportToSubsystem(NetworkCapabilities nc) {

            if (nc.hasTransport(TRANSPORT_WIFI)) {

                return CPU_WAKEUP_SUBSYSTEM_WIFI;

            }

            return CPU_WAKEUP_SUBSYSTEM_UNKNOWN;

        }



        @Override

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

            Slog.d(TAG, "Wakeup due to incoming packet on network " + network + " to uid " + uid);

            if (uid < 0) {

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

                return;

            }

            final ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);

            final NetworkCapabilities nc = cm.getNetworkCapabilities(network);

            final int subsystem = transportToSubsystem(nc);



            if (subsystem == CPU_WAKEUP_SUBSYSTEM_UNKNOWN) {

                Slog.wtf(TAG, "Could not map transport for network: " + network

                        + " while attributing wakeup by packet sent to uid: " + uid);

                return;

            }

            noteCpuWakingActivity(subsystem, elapsedMillis, uid);

        }



        @Override

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

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


import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_ALARM;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_UNKNOWN;

import static android.os.BatteryStatsInternal.CPU_WAKEUP_SUBSYSTEM_WIFI;



import android.content.Context;

import android.os.Handler;
@@ -49,6 +50,7 @@ public class CpuWakeupStats { 
    private static final String TAG = "CpuWakeupStats";



    private static final String SUBSYSTEM_ALARM_STRING = "Alarm";

    private static final String SUBSYSTEM_ALARM_WIFI = "Wifi";

    @VisibleForTesting

    static final long WAKEUP_RETENTION_MS = 3 * 24 * 60 * 60_000; // 3 days.

    @VisibleForTesting
@@ -74,6 +76,8 @@ public class CpuWakeupStats { 
        switch (subsystem) {

            case CPU_WAKEUP_SUBSYSTEM_ALARM:

                return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__REASON__ALARM;

            case CPU_WAKEUP_SUBSYSTEM_WIFI:

                return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__REASON__WIFI;

        }

        return FrameworkStatsLog.KERNEL_WAKEUP_ATTRIBUTED__REASON__UNKNOWN;

    }
@@ -425,6 +429,8 @@ public class CpuWakeupStats { 
        switch (rawSubsystem) {

            case SUBSYSTEM_ALARM_STRING:

                return CPU_WAKEUP_SUBSYSTEM_ALARM;

            case SUBSYSTEM_ALARM_WIFI:

                return CPU_WAKEUP_SUBSYSTEM_WIFI;

        }

        return CPU_WAKEUP_SUBSYSTEM_UNKNOWN;

    }
@@ -433,6 +439,8 @@ public class CpuWakeupStats { 
        switch (subsystem) {

            case CPU_WAKEUP_SUBSYSTEM_ALARM:

                return SUBSYSTEM_ALARM_STRING;

            case CPU_WAKEUP_SUBSYSTEM_WIFI:

                return SUBSYSTEM_ALARM_WIFI;

            case CPU_WAKEUP_SUBSYSTEM_UNKNOWN:

                return "Unknown";

        }