Merge "Change the doc for disableEphemeralNetwork." into rvc-dev am: 3045fafd78 (4c424a8f) · Commits · e / os / android_frameworks_base

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -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();
		}