summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorNate Jiang <qiangjiang@google.com>2020-11-10 13:00:07 -0800
committerNate Jiang <qiangjiang@google.com>2020-11-12 14:47:30 -0800
commit6df0e8bf6c1f0379a3f90e9560f64dcb831a26cd (patch)
tree7ee314fb499d29659890f18085d636f11d9b5fae /api
parent5d1ebbbb31fb5e89bcc432f9b359a5f7b9653856 (diff)
[Suggestion] API to set carrier merged network
Create a new API to set carrier merged network suggestion Bug: 172867186 Test: atest android.net.wifi Change-Id: I5ddbc8b15e361e44c508e40dac10211cbd39ab10
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 576f3f241a7a..4f5e09690488 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31858,6 +31858,7 @@ package android.net.wifi {
method @Nullable public String getSsid();
method public int getSubscriptionId();
method public boolean isAppInteractionRequired();
+ method public boolean isCarrierMerged();
method public boolean isCredentialSharedWithUser();
method public boolean isEnhancedOpen();
method public boolean isHiddenSsid();
@@ -31873,6 +31874,7 @@ package android.net.wifi {
ctor public WifiNetworkSuggestion.Builder();
method @NonNull public android.net.wifi.WifiNetworkSuggestion build();
method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setBssid(@NonNull android.net.MacAddress);
+ method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setCarrierMerged(boolean);
method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setCredentialSharedWithUser(boolean);
method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsAppInteractionRequired(boolean);
method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsEnhancedMacRandomizationEnabled(boolean);