Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd am: dce01e235b am: baf9bb8563

Browse Source 
am: 8bad14363e

Change-Id: I545524b640fc1fbef547b0006fa6288bc45be7c1
This commit is contained in:
Etan Cohen
2017-01-07 20:34:49 +00:00
committed by android-build-merger
parent dcfb346761 8bad14363e
commit d8fa1bb1f3
7 changed files with 16 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/aware/DiscoverySession.java
View File

@@ -93,7 +93,7 @@ public class DiscoverySession {
* This operation must be done on a session which is no longer needed. Otherwise system
* resources will continue to be utilized until the application exits. The only
* exception is a session for which we received a termination callback,
* {@link DiscoverySessionCallback#onSessionTerminated(int)}.
* {@link DiscoverySessionCallback#onSessionTerminated()}.
*/
public void destroy() {
WifiAwareManager mgr = mMgr.get();

33
wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java
View File

@@ -16,11 +16,8 @@
package android.net.wifi.aware;
import android.annotation.IntDef;
import android.annotation.NonNull;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
/**
@@ -37,29 +34,6 @@ import java.util.List;
* @hide PROPOSED_AWARE_API
*/
public class DiscoverySessionCallback {
/** @hide */
@IntDef({
TERMINATE_REASON_DONE, TERMINATE_REASON_FAIL })
@Retention(RetentionPolicy.SOURCE)
public @interface SessionTerminateCodes {
}
/**
* Indicates that publish or subscribe session is done - all the
* requested operations (per {@link PublishConfig} or
* {@link SubscribeConfig}) have been executed. Failure reason flag for
* {@link DiscoverySessionCallback#onSessionTerminated(int)} callback.
*/
public static final int TERMINATE_REASON_DONE = 100;
/**
* Indicates that publish or subscribe session is terminated due to a
* failure.
* Failure reason flag for
* {@link DiscoverySessionCallback#onSessionTerminated(int)} callback.
*/
public static final int TERMINATE_REASON_FAIL = 101;
/**
* Called when a publish operation is started successfully in response to a
* {@link WifiAwareSession#publish(PublishConfig, DiscoverySessionCallback,
@@ -114,12 +88,9 @@ public class DiscoverySessionCallback {
* Called when a discovery session (publish or subscribe) terminates. Termination may be due
* to user-request (either directly through {@link DiscoverySession#destroy()} or
* application-specified expiration, e.g. {@link PublishConfig.Builder#setPublishCount(int)}
* or {@link SubscribeConfig.Builder#setTtlSec(int)}) or due to a failure.
*
* @param reason The termination reason using
* {@code DiscoverySessionCallback.TERMINATE_*} codes.
* or {@link SubscribeConfig.Builder#setTtlSec(int)}).
*/
public void onSessionTerminated(@SessionTerminateCodes int reason) {
public void onSessionTerminated() {
/* empty */
}

10
wifi/java/android/net/wifi/aware/PublishConfig.java
View File

@@ -322,9 +322,8 @@ public final class PublishConfig implements Parcelable {
* Sets the number of times an unsolicited (configured using
* {@link PublishConfig.Builder#setPublishType(int)}) publish session
* will be broadcast. When the count is reached an event will be
* generated for {@link DiscoverySessionCallback#onSessionTerminated(int)}
* with {@link DiscoverySessionCallback#TERMINATE_REASON_DONE} [unless
* {@link #setTerminateNotificationEnabled(boolean)} disables the callback].
* generated for {@link DiscoverySessionCallback#onSessionTerminated()}
* [unless {@link #setTerminateNotificationEnabled(boolean)} disables the callback].
* <p>
* Optional. 0 by default - indicating the session doesn't terminate on its own.
* Session will be terminated when {@link DiscoverySession#destroy()} is
@@ -348,8 +347,7 @@ public final class PublishConfig implements Parcelable {
* {@link PublishConfig.Builder#setPublishType(int)}) publish session
* will be alive - broadcasting a packet. When the TTL is reached
* an event will be generated for
* {@link DiscoverySessionCallback#onSessionTerminated(int)} with
* {@link DiscoverySessionCallback#TERMINATE_REASON_DONE} [unless
* {@link DiscoverySessionCallback#onSessionTerminated()} [unless
* {@link #setTerminateNotificationEnabled(boolean)} disables the callback].
* <p>
* Optional. 0 by default - indicating the session doesn't terminate on its own.
@@ -371,7 +369,7 @@ public final class PublishConfig implements Parcelable {
/**
* Configure whether a publish terminate notification
* {@link DiscoverySessionCallback#onSessionTerminated(int)} is reported
* {@link DiscoverySessionCallback#onSessionTerminated()} is reported
* back to the callback.
*
* @param enable If true the terminate callback will be called when the

8
wifi/java/android/net/wifi/aware/SubscribeConfig.java
View File

@@ -355,8 +355,7 @@ public final class SubscribeConfig implements Parcelable {
* Sets the number of times an active (
* {@link SubscribeConfig.Builder#setSubscribeType(int)}) subscribe session
* will broadcast. When the count is reached an event will be
* generated for {@link DiscoverySessionCallback#onSessionTerminated(int)}
* with {@link DiscoverySessionCallback#TERMINATE_REASON_DONE}.
* generated for {@link DiscoverySessionCallback#onSessionTerminated()}.
* <p>
* Optional. 0 by default - indicating the session doesn't terminate on its own.
* Session will be terminated when {@link DiscoverySession#destroy()} is
@@ -380,8 +379,7 @@ public final class SubscribeConfig implements Parcelable {
* {@link SubscribeConfig.Builder#setSubscribeType(int)}) subscribe session
* will be alive - i.e. broadcasting a packet. When the TTL is reached
* an event will be generated for
* {@link DiscoverySessionCallback#onSessionTerminated(int)} with
* {@link DiscoverySessionCallback#TERMINATE_REASON_DONE}.
* {@link DiscoverySessionCallback#onSessionTerminated()}.
* <p>
* Optional. 0 by default - indicating the session doesn't terminate on its own.
* Session will be terminated when {@link DiscoverySession#destroy()} is
@@ -424,7 +422,7 @@ public final class SubscribeConfig implements Parcelable {
/**
* Configure whether a subscribe terminate notification
* {@link DiscoverySessionCallback#onSessionTerminated(int)} is reported
* {@link DiscoverySessionCallback#onSessionTerminated()} is reported
* back to the callback.
*
* @param enable If true the terminate callback will be called when the

2
wifi/java/android/net/wifi/aware/SubscribeDiscoverySession.java
View File

@@ -32,7 +32,7 @@ import android.util.Log;
* @hide PROPOSED_AWARE_API
*/
public class SubscribeDiscoverySession extends DiscoverySession {
private static final String TAG = "SubscribeDiscoverySession";
private static final String TAG = "SubscribeDiscSession";
/**
* {@hide}

2
wifi/java/android/net/wifi/aware/WifiAwareManager.java
View File

@@ -1027,7 +1027,7 @@ public class WifiAwareManager {
Log.w(TAG, "Proxy: onSessionTerminated called but mSession is null!?");
}
mAwareManager.clear();
mOriginalCallback.onSessionTerminated(reason);
mOriginalCallback.onSessionTerminated();
}
}
}

10
wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java
View File

@@ -376,7 +376,6 @@ public class WifiAwareManagerTest {
final int sessionId = 123;
final ConfigRequest configRequest = new ConfigRequest.Builder().build();
final PublishConfig publishConfig = new PublishConfig.Builder().build();
final int reason = DiscoverySessionCallback.TERMINATE_REASON_DONE;
InOrder inOrder = inOrder(mockCallback, mockSessionCallback, mockAwareService,
mockPublishSession);
@@ -403,10 +402,10 @@ public class WifiAwareManagerTest {
inOrder.verify(mockAwareService).publish(eq(clientId), eq(publishConfig),
sessionProxyCallback.capture());
sessionProxyCallback.getValue().onSessionStarted(sessionId);
sessionProxyCallback.getValue().onSessionTerminated(reason);
sessionProxyCallback.getValue().onSessionTerminated(0);
mMockLooper.dispatchAll();
inOrder.verify(mockSessionCallback).onPublishStarted(publishSession.capture());
inOrder.verify(mockSessionCallback).onSessionTerminated(reason);
inOrder.verify(mockSessionCallback).onSessionTerminated();
// (3) failure when trying to update: NOP
publishSession.getValue().updatePublish(publishConfig);
@@ -514,7 +513,6 @@ public class WifiAwareManagerTest {
final int sessionId = 123;
final ConfigRequest configRequest = new ConfigRequest.Builder().build();
final SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().build();
final int reason = DiscoverySessionCallback.TERMINATE_REASON_DONE;
InOrder inOrder = inOrder(mockCallback, mockSessionCallback, mockAwareService,
mockSubscribeSession);
@@ -541,10 +539,10 @@ public class WifiAwareManagerTest {
inOrder.verify(mockAwareService).subscribe(eq(clientId), eq(subscribeConfig),
sessionProxyCallback.capture());
sessionProxyCallback.getValue().onSessionStarted(sessionId);
sessionProxyCallback.getValue().onSessionTerminated(reason);
sessionProxyCallback.getValue().onSessionTerminated(0);
mMockLooper.dispatchAll();
inOrder.verify(mockSessionCallback).onSubscribeStarted(subscribeSession.capture());
inOrder.verify(mockSessionCallback).onSessionTerminated(reason);
inOrder.verify(mockSessionCallback).onSessionTerminated();
// (3) failure when trying to update: NOP
subscribeSession.getValue().updateSubscribe(subscribeConfig);