Merge "Prepare for exposing p2p API" (1d5f9cdc) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WpsConfiguration.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -46,16 +46,21 @@ public class WpsConfiguration implements Parcelable {

		public Setup setup;

		/** @hide */
		public String BSSID;

		public String pin;

		/** @hide */
		public IpAssignment ipAssignment;

		/** @hide */
		public ProxySettings proxySettings;

		/** @hide */
		public LinkProperties linkProperties;

		/** @hide */
		public WpsConfiguration() {
		setup = Setup.INVALID;
		BSSID = null;
		@@ -65,6 +70,7 @@ public class WpsConfiguration implements Parcelable {
		linkProperties = new LinkProperties();
		}

		/** @hide */
		public String toString() {
		StringBuffer sbuf = new StringBuffer();
		sbuf.append(" setup: ").append(setup.toString());

wifi/java/android/net/wifi/p2p/WifiP2pConfig.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -27,11 +27,6 @@ import android.os.Parcel;
		*/
		public class WifiP2pConfig implements Parcelable {

		/**
		* Device name
		*/
		public String deviceName;

		/**
		* Device address
		*/
		@@ -53,6 +48,7 @@ public class WifiP2pConfig implements Parcelable {

		/**
		* Indicates whether the configuration is saved
		* @hide
		*/
		public enum Persist {
		SYSTEM_DEFAULT,
		@@ -60,6 +56,7 @@ public class WifiP2pConfig implements Parcelable {
		NO
		}

		/** @hide */
		public Persist persist = Persist.SYSTEM_DEFAULT;

		public WifiP2pConfig() {
		@@ -110,7 +107,6 @@ public class WifiP2pConfig implements Parcelable {

		public String toString() {
		StringBuffer sbuf = new StringBuffer();
		sbuf.append("Device: ").append(deviceName);
		sbuf.append("\n address: ").append(deviceAddress);
		sbuf.append("\n wps: ").append(wpsConfig);
		sbuf.append("\n groupOwnerIntent: ").append(groupOwnerIntent);
		@@ -132,7 +128,6 @@ public class WifiP2pConfig implements Parcelable {

		/** Implement the Parcelable interface {@hide} */
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(deviceName);
		dest.writeString(deviceAddress);
		dest.writeParcelable(wpsConfig, flags);
		dest.writeInt(groupOwnerIntent);
		@@ -144,7 +139,6 @@ public class WifiP2pConfig implements Parcelable {
		new Creator<WifiP2pConfig>() {
		public WifiP2pConfig createFromParcel(Parcel in) {
		WifiP2pConfig config = new WifiP2pConfig();
		config.deviceName = in.readString();
		config.deviceAddress = in.readString();
		config.wpsConfig = (WpsConfiguration) in.readParcelable(null);
		config.groupOwnerIntent = in.readInt();

wifi/java/android/net/wifi/p2p/WifiP2pGroup.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public class WifiP2pGroup implements Parcelable {
		}

		/**
		* @param string formats supported include
		* @param supplicantEvent formats supported include
		*
		* P2P-GROUP-STARTED p2p-wlan0-0 [client\|GO] ssid="DIRECT-W8" freq=2437
		* [psk=2182b2e50e53f260d04f3c7b25ef33c965a3291b9b36b455a82d77fd82ca15bc\|

wifi/java/android/net/wifi/p2p/WifiP2pInfo.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -34,9 +34,11 @@ public class WifiP2pInfo implements Parcelable {

		public InetAddress groupOwnerAddress;

		public WifiP2pInfo() {
		/** @hide */
		WifiP2pInfo() {
		}

		/** @hide */
		public String toString() {
		StringBuffer sbuf = new StringBuffer();
		sbuf.append("groupFormed: ").append(groupFormed)

wifi/java/android/net/wifi/p2p/WifiP2pManager.java

+281 −40

File changed.

Preview size limit exceeded, changes collapsed.