From e4d7f7d8ccd1f6f403af8aaedd584276b6e7f761 Mon Sep 17 00:00:00 2001 From: "Nate(Qiang) Jiang" Date: Tue, 21 Jan 2020 12:37:03 -0800 Subject: [PATCH] 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 --- api/current.txt | 1 + wifi/java/android/net/wifi/WifiManager.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/api/current.txt b/api/current.txt index 1c03c23a0e01e..12b789e3856f3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 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_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_APP_DISALLOWED = 2; // 0x2 field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL = 1; // 0x1 diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index c35303da90566..208ce9c37b231 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -201,6 +201,13 @@ public class WifiManager { */ 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 */ @IntDef(prefix = { "STATUS_NETWORK_SUGGESTIONS_" }, value = { STATUS_NETWORK_SUGGESTIONS_SUCCESS, @@ -210,6 +217,7 @@ public class WifiManager { STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_EXCEEDS_MAX_PER_APP, STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID, STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_NOT_ALLOWED, + STATUS_NETWORK_SUGGESTIONS_ERROR_ADD_INVALID, }) @Retention(RetentionPolicy.SOURCE) public @interface NetworkSuggestionsStatusCode {}