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

Commit 7b9114f9 authored by Roshan Pius's avatar Roshan Pius
Browse files

WifiManager: Add a error code for suggestion API's 

When the user disallows CHANGE_WIFI_STATE app-ops, the suggestion API
surface will return the new error code.

Bug: 120072329
Test: Compiles
Change-Id: I59a62a64541120cad738e821ec6d70e320f79174
parent afafd66d

api/current.txt

+4 −3
Original line number Diff line number Diff line
@@ -29117,10 +29117,11 @@ package android.net.wifi { 
    field public static final java.lang.String NETWORK_STATE_CHANGED_ACTION = "android.net.wifi.STATE_CHANGE";

    field public static final java.lang.String RSSI_CHANGED_ACTION = "android.net.wifi.RSSI_CHANGED";

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

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

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP = 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_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_REMOVE_INVALID = 4; // 0x4

    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID = 5; // 0x5

    field public static final int STATUS_NETWORK_SUGGESTIONS_SUCCESS = 0; // 0x0

    field public static final deprecated java.lang.String SUPPLICANT_CONNECTION_CHANGE_ACTION = "android.net.wifi.supplicant.CONNECTION_CHANGE";

    field public static final deprecated java.lang.String SUPPLICANT_STATE_CHANGED_ACTION = "android.net.wifi.supplicant.STATE_CHANGE";

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

+10 −4
Original line number Diff line number Diff line
@@ -155,34 +155,40 @@ public class WifiManager { 
     */

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL = 1;



    /**

     * Reason code if the user has disallowed "android:change_wifi_state" app-ops from the app.

     * @see android.app.AppOpsManager#unsafeCheckOp(String, int, String).

     */

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED = 2;



    /**

     * Reason code if one or more of the network suggestions added already exists in platform's

     * database.

     * @see WifiNetworkSuggestion#equals(Object)

     */

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_DUPLICATE = 2;

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_DUPLICATE = 3;



    /**

     * Reason code if the number of network suggestions provided by the app crosses the max

     * threshold set per app.

     * @see #getMaxNumberOfNetworkSuggestionsPerApp()

     */

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP = 3;

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP = 4;



    /**

     * Reason code if one or more of the network suggestions removed does not exist in platform's

     * database.

     */

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID = 4;

    public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID = 5;



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

            STATUS_NETWORK_SUGGESTIONS_SUCCESS,

            STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL,

            STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED,

            STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_DUPLICATE,

            STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP,

            STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID,

    })



    @Retention(RetentionPolicy.SOURCE)

    public @interface NetworkSuggestionsStatusCode {}