Merge "Wifi: revise P2P API" (31e75e7e) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -31767,7 +31767,7 @@ package android.net.wifi.p2p {
		field public static final int GROUP_OWNER_INTENT_MAX = 15; // 0xf
		field public static final int GROUP_OWNER_INTENT_MIN = 0; // 0x0
		field public String deviceAddress;
		field public int groupOwnerIntent;
		field @IntRange(from=0, to=15) public int groupOwnerIntent;
		field public android.net.wifi.WpsInfo wps;
		}

		@@ -31959,14 +31959,14 @@ package android.net.wifi.p2p {
		method public int getDeviceType();
		method public int getMaxThroughput();
		method public boolean isContentProtectionSupported();
		method public boolean isEnabled();
		method public boolean isSessionAvailable();
		method public boolean isWfdEnabled();
		method public void setContentProtectionSupported(boolean);
		method public void setControlPort(int);
		method public void setControlPort(@IntRange(from=0) int);
		method public boolean setDeviceType(int);
		method public void setMaxThroughput(int);
		method public void setEnabled(boolean);
		method public void setMaxThroughput(@IntRange(from=0) int);
		method public void setSessionAvailable(boolean);
		method public void setWfdEnabled(boolean);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pWfdInfo> CREATOR;
		field public static final int DEVICE_TYPE_PRIMARY_SINK = 1; // 0x1

api/system-current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -8111,7 +8111,7 @@ package android.net.wifi.p2p {

		public final class WifiP2pGroupList implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public java.util.Collection<android.net.wifi.p2p.WifiP2pGroup> getGroupList();
		method @NonNull public java.util.List<android.net.wifi.p2p.WifiP2pGroup> getGroupList();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pGroupList> CREATOR;
		}
		@@ -8119,12 +8119,13 @@ package android.net.wifi.p2p {
		public class WifiP2pManager {
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void deletePersistentGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void factoryReset(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void listen(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, boolean, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public void requestPersistentGroupInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setDeviceName(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull String, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method @RequiresPermission(allOf={android.Manifest.permission.CONNECTIVITY_INTERNAL, android.Manifest.permission.CONFIGURE_WIFI_DISPLAY}) public void setMiracastMode(int);
		method @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setWfdInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pWfdInfo, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setWifiP2pChannels(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void startListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void stopListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
		field public static final String ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED = "android.net.wifi.p2p.action.WIFI_P2P_PERSISTENT_GROUPS_CHANGED";
		field public static final int MIRACAST_DISABLED = 0; // 0x0
		field public static final int MIRACAST_SINK = 2; // 0x2

services/core/java/com/android/server/display/WifiDisplayController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -291,7 +291,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
		mWfdEnabling = true;

		WifiP2pWfdInfo wfdInfo = new WifiP2pWfdInfo();
		wfdInfo.setWfdEnabled(true);
		wfdInfo.setEnabled(true);
		wfdInfo.setDeviceType(WifiP2pWfdInfo.DEVICE_TYPE_WFD_SOURCE);
		wfdInfo.setSessionAvailable(true);
		wfdInfo.setControlPort(DEFAULT_CONTROL_PORT);
		@@ -323,7 +323,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
		// WFD should be disabled.
		if (mWfdEnabled \|\| mWfdEnabling) {
		WifiP2pWfdInfo wfdInfo = new WifiP2pWfdInfo();
		wfdInfo.setWfdEnabled(false);
		wfdInfo.setEnabled(false);
		mWifiP2pManager.setWfdInfo(mWifiP2pChannel, wfdInfo, new ActionListener() {
		@Override
		public void onSuccess() {
		@@ -1044,7 +1044,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
		private static boolean isWifiDisplay(WifiP2pDevice device) {
		WifiP2pWfdInfo wfdInfo = device.getWfdInfo();
		return wfdInfo != null
		&& wfdInfo.isWfdEnabled()
		&& wfdInfo.isEnabled()
		&& isPrimarySinkDeviceType(wfdInfo.getDeviceType());
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.net.wifi.p2p;

		import android.annotation.IntDef;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.compat.annotation.UnsupportedAppUsage;
		@@ -133,6 +134,7 @@ public class WifiP2pConfig implements Parcelable {
		*
		* By default this field is set to {@link #GROUP_OWNER_INTENT_AUTO}.
		*/
		@IntRange(from = 0, to = 15)
		public int groupOwnerIntent = GROUP_OWNER_INTENT_AUTO;

		/** @hide */

wifi/java/android/net/wifi/p2p/WifiP2pGroupList.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,9 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.LruCache;

		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.List;
		import java.util.Map;


		@@ -78,8 +80,8 @@ public final class WifiP2pGroupList implements Parcelable {
		* Get the list of P2P groups.
		*/
		@NonNull
		public Collection<WifiP2pGroup> getGroupList() {
		return mGroups.snapshot().values();
		public List<WifiP2pGroup> getGroupList() {
		return new ArrayList<>(mGroups.snapshot().values());
		}

		/**