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

Commit 8a6a7578 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "BatterStatsManager: Remove "flag" for wifi IntDef's"

parents 56cf2dd5 91c285be

core/java/android/os/BatteryStatsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public final class BatteryStatsManager { 
    public static final int NUM_WIFI_STATES = WIFI_STATE_SOFT_AP + 1;



    /** @hide */

    @IntDef(flag = true, prefix = { "WIFI_STATE_" }, value = {

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

            WIFI_STATE_OFF,

            WIFI_STATE_OFF_SCANNING,

            WIFI_STATE_ON_NO_NETWORKS,
@@ -135,7 +135,7 @@ public final class BatteryStatsManager { 
    public static final int NUM_WIFI_SUPPL_STATES = WIFI_SUPPL_STATE_UNINITIALIZED + 1;



    /** @hide */

    @IntDef(flag = true, prefix = { "WIFI_SUPPL_STATE_" }, value = {

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

            WIFI_SUPPL_STATE_INVALID,

            WIFI_SUPPL_STATE_DISCONNECTED,

            WIFI_SUPPL_STATE_INTERFACE_DISABLED,