Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev (a4144563) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/IWifiManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -154,5 +154,7 @@ interface IWifiManager
		void setAllowScansWithTraffic(int enabled);

		WifiConnectionStatistics getConnectionStatistics();

		void disableEphemeralNetwork(String SSID);
		}

+14 −1

Original line number	Diff line number	Diff line
		@@ -1632,7 +1632,6 @@ public class WifiManager {
		/** @hide */
		public static final int RSSI_PKTCNT_FETCH_FAILED = BASE + 22;


		/**
		* Passed with {@link ActionListener#onFailure}.
		* Indicates that the operation failed due to an internal error.
		@@ -1981,6 +1980,20 @@ public class WifiManager {
		sAsyncChannel.sendMessage(DISABLE_NETWORK, netId, putListener(listener));
		}

		/**
		* Disable ephemeral Network
		*
		* @param SSID, in the format of WifiConfiguration's SSID.
		* @hide
		*/
		public void disableEphemeralNetwork(String SSID) {
		if (SSID == null) throw new IllegalArgumentException("SSID cannot be null");
		try {
		mService.disableEphemeralNetwork(SSID);
		} catch (RemoteException e) {
		}
		}

		/**
		* Start Wi-fi Protected Setup
		*