diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-11-14 06:55:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-14 06:55:16 +0000 |
| commit | 3ce8ab96313161426c0a8b487f40053349b22e9e (patch) | |
| tree | b6089325068654d35c11674c2411c93747c35c04 /api | |
| parent | 886277e4d0cdd2298a05c0b6a090961d87a54322 (diff) | |
| parent | b71f909e1d9d64d995d53ab9d6bd8dce30e87f4a (diff) | |
Merge changes from topics "mergedNetwork", "wifiInfoSubId"
* changes:
Add API to get Subscription Id
[Suggestion] API to set carrier merged network
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 572867fc94d4..e24df4204af4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31894,6 +31894,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(); @@ -31909,6 +31910,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); |