Merge changes from topic 'am-a57c7c884e184332ab6ba25437abb1a5' (06d202d3) · Commits · e / os / android_frameworks_base

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -59,11 +59,6 @@ interface IWifiManager

		int addOrUpdateNetwork(in WifiConfiguration config);

		int addPasspointManagementObject(String mo);

		int modifyPasspointManagementObject(String fqdn,
		in List<PasspointManagementObjectDefinition> mos);

		boolean addPasspointConfiguration(in PasspointConfiguration config);

		boolean removePasspointConfiguration(in String fqdn);
		@@ -132,8 +127,6 @@ interface IWifiManager

		WifiConfiguration getWifiApConfiguration();

		WifiConfiguration buildWifiConfig(String uriString, String mimeType, in byte[] data);

		void setWifiApConfiguration(in WifiConfiguration wifiConfig);

		Messenger getWifiServiceMessenger();

+0 −44

Original line number	Diff line number	Diff line
		@@ -841,36 +841,6 @@ public class WifiManager {
		}
		}

		/**
		* Add a Hotspot 2.0 release 2 Management Object
		* @param mo The MO in XML form
		* @return -1 for failure
		* @hide
		*/
		public int addPasspointManagementObject(String mo) {
		try {
		return mService.addPasspointManagementObject(mo);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Modify a Hotspot 2.0 release 2 Management Object
		* @param fqdn The FQDN of the service provider
		* @param mos A List of MO definitions to be updated
		* @return the number of nodes updated, or -1 for failure
		* @hide
		*/
		public int modifyPasspointManagementObject(String fqdn,
		List<PasspointManagementObjectDefinition> mos) {
		try {
		return mService.modifyPasspointManagementObject(fqdn, mos);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Add a Passpoint configuration. The configuration provides a credential
		* for connecting to Passpoint networks that are operated by the Passpoint
		@@ -1627,20 +1597,6 @@ public class WifiManager {
		}
		}

		/**
		* Builds a WifiConfiguration from Hotspot 2.0 MIME file.
		* @return AP details in WifiConfiguration
		*
		* @hide Dont open yet
		*/
		public WifiConfiguration buildWifiConfig(String uriString, String mimeType, byte[] data) {
		try {
		return mService.buildWifiConfig(uriString, mimeType, data);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Sets the Wi-Fi AP Configuration.
		* @return {@code true} if the operation succeeded, {@code false} otherwise