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

Commit e4d7f7d8 authored by Nate(Qiang) Jiang's avatar Nate(Qiang) Jiang
Browse files

Add error code for app adding invalid suggestions 

If one or more of the suggestions added is invalid, will reject all.

Bug: 147907699
Test: atest android.net.wifi
Change-Id: I2f6c83a811539c682861c4d6e622c52f583d9832
parent 3087e3d6

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -30996,6 +30996,7 @@ package android.net.wifi { 
    field public static final String SCAN_RESULTS_AVAILABLE_ACTION = "android.net.wifi.SCAN_RESULTS";

    field public static final String SCAN_RESULTS_AVAILABLE_ACTION = "android.net.wifi.SCAN_RESULTS";

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_DUPLICATE = 3; // 0x3

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_DUPLICATE = 3; // 0x3

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP = 4; // 0x4

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP = 4; // 0x4

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_INVALID = 7; // 0x7

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_NOT_ALLOWED = 6; // 0x6

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_NOT_ALLOWED = 6; // 0x6

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED = 2; // 0x2

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED = 2; // 0x2

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL = 1; // 0x1

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL = 1; // 0x1

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -201,6 +201,13 @@ public class WifiManager { 
     */

     */

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_NOT_ALLOWED = 6;

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_NOT_ALLOWED = 6;





    /**

     * Reason code if one or more of the network suggestions added is invalid.

     *

     * Please user {@link WifiNetworkSuggestion.Builder} to create network suggestions.

     */

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_INVALID = 7;



    /** @hide */

    /** @hide */

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

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

            STATUS_NETWORK_SUGGESTIONS_SUCCESS,

            STATUS_NETWORK_SUGGESTIONS_SUCCESS,
@@ -210,6 +217,7 @@ public class WifiManager { 
            STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP,

            STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP,

            STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID,

            STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID,

            STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_NOT_ALLOWED,

            STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_NOT_ALLOWED,

            STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_INVALID,

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface NetworkSuggestionsStatusCode {}

    public @interface NetworkSuggestionsStatusCode {}