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

Commit 50b9e16b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "statsd: Allow wifi mainline module to log its metrics (contd)"

parents a9cfb69c d98deeb6

cmds/statsd/src/atoms.proto

+3 −3
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ message Atom { 
        WakeupAlarmOccurred wakeup_alarm_occurred = 35;

        KernelWakeupReported kernel_wakeup_reported = 36;

        WifiLockStateChanged wifi_lock_state_changed = 37 [(log_from_module) = "wifi"];

        WifiSignalStrengthChanged wifi_signal_strength_changed = 38;

        WifiScanStateChanged wifi_scan_state_changed = 39;

        WifiSignalStrengthChanged wifi_signal_strength_changed = 38 [(log_from_module) = "wifi"];

        WifiScanStateChanged wifi_scan_state_changed = 39 [(log_from_module) = "wifi"];

        PhoneSignalStrengthChanged phone_signal_strength_changed = 40;

        SettingChanged setting_changed = 41;

        ActivityForegroundStateChanged activity_foreground_state_changed = 42;
@@ -128,7 +128,7 @@ message Atom { 
        AppStartFullyDrawn app_start_fully_drawn = 50;

        LmkKillOccurred lmk_kill_occurred = 51;

        PictureInPictureStateChanged picture_in_picture_state_changed = 52;

        WifiMulticastLockStateChanged wifi_multicast_lock_state_changed = 53;

        WifiMulticastLockStateChanged wifi_multicast_lock_state_changed = 53 [(log_from_module) = "wifi"];

        LmkStateChanged lmk_state_changed = 54;

        AppStartMemoryStateCaptured app_start_memory_state_captured = 55;

        ShutdownSequenceReported shutdown_sequence_reported = 56;

wifi/java/android/net/wifi/WifiManager.java

+5 −5
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ public class WifiManager { 
     * @deprecated This API is non-functional and will have no impact.

     */

    @Deprecated

    public static final int WIFI_MODE_FULL = WifiProtoEnums.WIFI_MODE_FULL; // 1

    public static final int WIFI_MODE_FULL = 1;



    /**

     * In this Wi-Fi lock mode, Wi-Fi will be kept active,
@@ -1083,7 +1083,7 @@ public class WifiManager { 
     * @deprecated This API is non-functional and will have no impact.

     */

    @Deprecated

    public static final int WIFI_MODE_SCAN_ONLY = WifiProtoEnums.WIFI_MODE_SCAN_ONLY; // 2

    public static final int WIFI_MODE_SCAN_ONLY = 2;



    /**

     * In this Wi-Fi lock mode, Wi-Fi will not go to power save.
@@ -1102,7 +1102,7 @@ public class WifiManager { 
     * When there is no support from the hardware, the {@link #WIFI_MODE_FULL_HIGH_PERF}

     * lock will have no impact.

     */

    public static final int WIFI_MODE_FULL_HIGH_PERF = WifiProtoEnums.WIFI_MODE_FULL_HIGH_PERF; // 3

    public static final int WIFI_MODE_FULL_HIGH_PERF = 3;



    /**

     * In this Wi-Fi lock mode, Wi-Fi will operate with a priority to achieve low latency.
@@ -1132,8 +1132,8 @@ public class WifiManager { 
     * lock will be effective when app is running in foreground and screen is on,

     * while the {@link #WIFI_MODE_FULL_HIGH_PERF} lock will take effect otherwise.

     */

    public static final int WIFI_MODE_FULL_LOW_LATENCY =

            WifiProtoEnums.WIFI_MODE_FULL_LOW_LATENCY; // 4

    public static final int WIFI_MODE_FULL_LOW_LATENCY = 4;





    /** Anything worse than or equal to this will show 0 bars. */

    @UnsupportedAppUsage