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

Commit 61510f10 authored by Oscar Shu's avatar Oscar Shu Committed by Android (Google) Code Review
Browse files

Merge "New recent failure reason for MBO"

parents 9de07684 fe4d3923

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7248,6 +7248,7 @@ package android.net.wifi { 
    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0

    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

    field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11

    field @Deprecated public static final int RECENT_FAILURE_MBO_OCE_DISCONNECT = 1001; // 0x3e9

    field @Deprecated public static final int RECENT_FAILURE_NONE = 0; // 0x0

    field @Deprecated public boolean allowAutojoin;

    field @Deprecated public int carrierId;

wifi/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ package android.net.wifi { 
    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0

    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1

    field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11

    field @Deprecated public static final int RECENT_FAILURE_MBO_OCE_DISCONNECT = 1001; // 0x3e9

    field @Deprecated public static final int RECENT_FAILURE_NONE = 0; // 0x0

    field @Deprecated public boolean allowAutojoin;

    field @Deprecated public int carrierId;

wifi/java/android/net/wifi/WifiConfiguration.java

+9 −1
Original line number Diff line number Diff line
@@ -2066,7 +2066,8 @@ public class WifiConfiguration implements Parcelable { 
    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = "RECENT_FAILURE_", value = {

            RECENT_FAILURE_NONE,

            RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA})

            RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA,

            RECENT_FAILURE_MBO_OCE_DISCONNECT})

    public @interface RecentFailureReason {}



    /**
@@ -2083,6 +2084,13 @@ public class WifiConfiguration implements Parcelable { 
    @SystemApi

    public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17;



    /**

     * This network recently disconnected as a result of MBO/OCE.

     * @hide

     */

    @SystemApi

    public static final int RECENT_FAILURE_MBO_OCE_DISCONNECT = 1001;



    /**

     * Get the failure reason for the most recent connection attempt, or

     * {@link #RECENT_FAILURE_NONE} if there was no failure.