Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change the doc for disableEphemeralNetwork." into rvc-dev am: 3045fafd78 am: 618e105b63 am: 6fe316ae04 am: 901a364f4b

Browse Source 
Change-Id: Ia8e6d14c8930fdf6f7abc8bcca42b3612ec009a3
This commit is contained in:
Automerger Merge Worker
2020-03-05 06:25:58 +00:00
parent 965d2b1974 901a364f4b
commit b2f5a43f71
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -4441,10 +4441,11 @@ public class WifiManager {
}
/**
* Disable an ephemeral network.
*
* @param ssid in the format of WifiConfiguration's SSID.
* Temporarily disable a network. Should always trigger with user disconnect network.
*
* @param network Input can be SSID or FQDN. And caller must ensure that the SSID passed thru
* this API matched the WifiConfiguration.SSID rules, and thus be surrounded by
* quotes.
* @hide
*/
@SystemApi
@@ -4452,12 +4453,12 @@ public class WifiManager {
android.Manifest.permission.NETWORK_SETTINGS,
android.Manifest.permission.NETWORK_STACK
})
public void disableEphemeralNetwork(@NonNull String ssid) {
if (TextUtils.isEmpty(ssid)) {
public void disableEphemeralNetwork(@NonNull String network) {
if (TextUtils.isEmpty(network)) {
throw new IllegalArgumentException("SSID cannot be null or empty!");
}
try {
mService.disableEphemeralNetwork(ssid, mContext.getOpPackageName());
mService.disableEphemeralNetwork(network, mContext.getOpPackageName());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}