Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am: f81911bcd2 (07864e35) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -24916,8 +24916,6 @@ package android.net.wifi.aware {
		public class DiscoverySession {
		method public java.lang.String createNetworkSpecifier(android.net.wifi.aware.PeerHandle, byte[]);
		method public void destroy();
		method public static int getMaxSendRetryCount();
		method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[], int);
		method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);
		}

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -27469,8 +27469,6 @@ package android.net.wifi.aware {
		public class DiscoverySession {
		method public java.lang.String createNetworkSpecifier(android.net.wifi.aware.PeerHandle, byte[]);
		method public void destroy();
		method public static int getMaxSendRetryCount();
		method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[], int);
		method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);
		}

api/test-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -24990,8 +24990,6 @@ package android.net.wifi.aware {
		public class DiscoverySession {
		method public java.lang.String createNetworkSpecifier(android.net.wifi.aware.PeerHandle, byte[]);
		method public void destroy();
		method public static int getMaxSendRetryCount();
		method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[], int);
		method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);
		}

wifi/java/android/net/wifi/aware/DiscoverySession.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -31,8 +31,7 @@ import java.lang.ref.WeakReference;
		* {@link PublishDiscoverySession} and {@link SubscribeDiscoverySession}. This
		* class provides functionality common to both publish and subscribe discovery sessions:
		* <ul>
		* <li>Sending messages: {@link #sendMessage(PeerHandle, int, byte[])} or
		* {@link #sendMessage(PeerHandle, int, byte[], int)} methods.
		* <li>Sending messages: {@link #sendMessage(PeerHandle, int, byte[])}.
		* <li>Creating a network-specifier when requesting a Aware connection:
		* {@link #createNetworkSpecifier(PeerHandle, byte[])}.
		* </ul>
		@@ -62,6 +61,8 @@ public class DiscoverySession {
		* {@link #sendMessage(PeerHandle, int, byte[], int)}.
		*
		* @return Maximum retry count when sending messages.
		*
		* @hide
		*/
		public static int getMaxSendRetryCount() {
		return MAX_SEND_RETRY_COUNT;
		@@ -163,6 +164,8 @@ public class DiscoverySession {
		* or MAC level) retries should be attempted if there is no ACK from the receiver
		* (note: no retransmissions are attempted in other failure cases). A value of 0
		* indicates no retries. Max permitted value is {@link #getMaxSendRetryCount()}.
		*
		* @hide
		*/
		public void sendMessage(@NonNull PeerHandle peerHandle, int messageId,
		@Nullable byte[] message, int retryCount) {
		@@ -195,8 +198,6 @@ public class DiscoverySession {
		* The peer will get a callback indicating a message was received using
		* {@link DiscoverySessionCallback#onMessageReceived(PeerHandle,
		* byte[])}.
		* Equivalent to {@link #sendMessage(PeerHandle, int, byte[], int)}
		* with a {@code retryCount} of 0.
		*
		* @param peerHandle The peer's handle for the message. Must be a result of an
		* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle,

wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -124,10 +124,9 @@ public class DiscoverySessionCallback {
		}

		/**
		* Called when message transmission fails - when no ACK is received from the peer.
		* Retries when ACKs are not received are done by hardware, MAC, and in the Aware stack (using
		* the {@link DiscoverySession#sendMessage(PeerHandle, int,
		* byte[], int)} method) - this event is received after all retries are exhausted.
		* Called when message transmission initiated with
		* {@link DiscoverySession#sendMessage(PeerHandle, int, byte[])} fails. E.g. when no ACK is
		* received from the peer.
		* <p>
		* Note that either this callback or
		* {@link DiscoverySessionCallback#onMessageSendSucceeded(int)} will be received
		@@ -141,9 +140,7 @@ public class DiscoverySessionCallback {

		/**
		* Called when a message is received from a discovery session peer - in response to the
		* peer's {@link DiscoverySession#sendMessage(PeerHandle, int,
		* byte[])} or {@link DiscoverySession#sendMessage(PeerHandle,
		* int, byte[], int)}.
		* peer's {@link DiscoverySession#sendMessage(PeerHandle, int, byte[])}.
		*
		* @param peerHandle An opaque handle to the peer matching our discovery operation.
		* @param message A byte array containing the message.