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

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

Merge "[DPP] Add _GENERIC suffix to EASY_CONNECT_EVENT_FAILURE code"

parents 0dc69778 5ec038ab

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -3933,10 +3933,10 @@ package android.net.wifi { 
    method public abstract void onEnrolleeSuccess(int);

    method public abstract void onEnrolleeSuccess(int);

    method public abstract void onFailure(int);

    method public abstract void onFailure(int);

    method public abstract void onProgress(int);

    method public abstract void onProgress(int);

    field public static final int EASY_CONNECT_EVENT_FAILURE = -7; // 0xfffffff9

    field public static final int EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION = -2; // 0xfffffffe

    field public static final int EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION = -2; // 0xfffffffe

    field public static final int EASY_CONNECT_EVENT_FAILURE_BUSY = -5; // 0xfffffffb

    field public static final int EASY_CONNECT_EVENT_FAILURE_BUSY = -5; // 0xfffffffb

    field public static final int EASY_CONNECT_EVENT_FAILURE_CONFIGURATION = -4; // 0xfffffffc

    field public static final int EASY_CONNECT_EVENT_FAILURE_CONFIGURATION = -4; // 0xfffffffc

    field public static final int EASY_CONNECT_EVENT_FAILURE_GENERIC = -7; // 0xfffffff9

    field public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK = -9; // 0xfffffff7

    field public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK = -9; // 0xfffffff7

    field public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_URI = -1; // 0xffffffff

    field public static final int EASY_CONNECT_EVENT_FAILURE_INVALID_URI = -1; // 0xffffffff

    field public static final int EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE = -3; // 0xfffffffd

    field public static final int EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE = -3; // 0xfffffffd

wifi/java/android/net/wifi/EasyConnectStatusCallback.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ public abstract class EasyConnectStatusCallback { 
    /**

    /**

     * Easy Connect Failure event: General protocol failure.

     * Easy Connect Failure event: General protocol failure.

     */

     */

    public static final int EASY_CONNECT_EVENT_FAILURE = -7;

    public static final int EASY_CONNECT_EVENT_FAILURE_GENERIC = -7;





    /**

    /**

     * Easy Connect Failure event: Feature or option is not supported.

     * Easy Connect Failure event: Feature or option is not supported.
@@ -123,7 +123,7 @@ public abstract class EasyConnectStatusCallback { 
            EASY_CONNECT_EVENT_FAILURE_CONFIGURATION,

            EASY_CONNECT_EVENT_FAILURE_CONFIGURATION,

            EASY_CONNECT_EVENT_FAILURE_BUSY,

            EASY_CONNECT_EVENT_FAILURE_BUSY,

            EASY_CONNECT_EVENT_FAILURE_TIMEOUT,

            EASY_CONNECT_EVENT_FAILURE_TIMEOUT,

            EASY_CONNECT_EVENT_FAILURE,

            EASY_CONNECT_EVENT_FAILURE_GENERIC,

            EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED,

            EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED,

            EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK,

            EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK,

    })

    })