Merge "[AWARE] Simplify Wi-Fi Aware API namespace"

4 files changed, 30 insertions, 29 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
index 675b61cb9..6177b336d 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -40,19 +40,20 @@ import android.net.NetworkInfo;
 import android.net.NetworkMisc;
 import android.net.NetworkRequest;
 import android.net.wifi.RttManager;
+import android.net.wifi.aware.AttachCallback;
 import android.net.wifi.aware.ConfigRequest;
+import android.net.wifi.aware.DiscoverySession;
+import android.net.wifi.aware.DiscoverySessionCallback;
 import android.net.wifi.aware.IWifiAwareDiscoverySessionCallback;
 import android.net.wifi.aware.IWifiAwareEventCallback;
 import android.net.wifi.aware.IWifiAwareManager;
+import android.net.wifi.aware.PeerHandle;
 import android.net.wifi.aware.PublishConfig;
+import android.net.wifi.aware.PublishDiscoverySession;
 import android.net.wifi.aware.SubscribeConfig;
-import android.net.wifi.aware.WifiAwareAttachCallback;
-import android.net.wifi.aware.WifiAwareDiscoveryBaseSession;
-import android.net.wifi.aware.WifiAwareDiscoverySessionCallback;
+import android.net.wifi.aware.SubscribeDiscoverySession;
 import android.net.wifi.aware.WifiAwareManager;
-import android.net.wifi.aware.WifiAwarePublishDiscoverySession;
 import android.net.wifi.aware.WifiAwareSession;
-import android.net.wifi.aware.WifiAwareSubscribeDiscoverySession;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.INetworkManagementService;
@@ -92,8 +93,8 @@ public class WifiAwareDataPathStateManagerTest {
     @Mock private WifiAwareNative mMockNative;
     @Mock private Context mMockContext;
     @Mock private IWifiAwareManager mMockAwareService;
-    @Mock private WifiAwarePublishDiscoverySession mMockPublishSession;
-    @Mock private WifiAwareSubscribeDiscoverySession mMockSubscribeSession;
+    @Mock private PublishDiscoverySession mMockPublishSession;
+    @Mock private SubscribeDiscoverySession mMockSubscribeSession;
     @Mock private RttManager.RttListener mMockRttListener;
     @Mock private ConnectivityManager mMockCm;
     @Mock private INetworkManagementService mMockNwMgt;
@@ -419,7 +420,7 @@ public class WifiAwareDataPathStateManagerTest {
         final int pubSubId = 11234;
         final int ndpId = 2;
         final String token = "some token";
-        final WifiAwareManager.PeerHandle peerHandle = new WifiAwareManager.PeerHandle(1341234);
+        final PeerHandle peerHandle = new PeerHandle(1341234);
         final byte[] peerDiscoveryMac = HexEncoding.decode("000102030405".toCharArray(), false);
 
         InOrder inOrder = inOrder(mMockNative, mMockCm, mMockCallback, mMockSessionCallback);
@@ -463,7 +464,7 @@ public class WifiAwareDataPathStateManagerTest {
             boolean provideToken, boolean getConfirmation) throws Exception {
         final int clientId = 123;
         final int pubSubId = 11234;
-        final WifiAwareManager.PeerHandle peerHandle = new WifiAwareManager.PeerHandle(1341234);
+        final PeerHandle peerHandle = new PeerHandle(1341234);
         final int ndpId = 2;
         final String token = "some token";
         final String peerToken = "let's go!";
@@ -544,7 +545,7 @@ public class WifiAwareDataPathStateManagerTest {
             boolean provideToken, boolean getConfirmation) throws Exception {
         final int clientId = 123;
         final int pubSubId = 11234;
-        final WifiAwareManager.PeerHandle peerHandle = new WifiAwareManager.PeerHandle(1341234);
+        final PeerHandle peerHandle = new PeerHandle(1341234);
         final int ndpId = 2;
         final String token = "some token";
         final String peerToken = "let's go!";
@@ -638,7 +639,7 @@ public class WifiAwareDataPathStateManagerTest {
     }
 
     private NetworkRequest getSessionNetworkRequest(int clientId, int sessionId,
-            WifiAwareManager.PeerHandle peerHandle, String token, boolean doPublish)
+            PeerHandle peerHandle, String token, boolean doPublish)
             throws Exception {
         final WifiAwareManager mgr = new WifiAwareManager(mMockContext, mMockAwareService);
         final ConfigRequest configRequest = new ConfigRequest.Builder().build();
@@ -651,12 +652,12 @@ public class WifiAwareDataPathStateManagerTest {
                 .forClass(IWifiAwareEventCallback.class);
         ArgumentCaptor<IWifiAwareDiscoverySessionCallback> sessionProxyCallback = ArgumentCaptor
                 .forClass(IWifiAwareDiscoverySessionCallback.class);
-        ArgumentCaptor<WifiAwareDiscoveryBaseSession> discoverySession = ArgumentCaptor
-                .forClass(WifiAwareDiscoveryBaseSession.class);
+        ArgumentCaptor<DiscoverySession> discoverySession = ArgumentCaptor
+                .forClass(DiscoverySession.class);
 
-        WifiAwareAttachCallback mockCallback = mock(WifiAwareAttachCallback.class);
-        WifiAwareDiscoverySessionCallback mockSessionCallback = mock(
-                WifiAwareDiscoverySessionCallback.class);
+        AttachCallback mockCallback = mock(AttachCallback.class);
+        DiscoverySessionCallback mockSessionCallback = mock(
+                DiscoverySessionCallback.class);
 
         mgr.attach(mMockLooperHandler, configRequest, mockCallback, null);
         verify(mMockAwareService).connect(any(IBinder.class), anyString(),
@@ -679,10 +680,10 @@ public class WifiAwareDataPathStateManagerTest {
         mMockLooper.dispatchAll();
         if (doPublish) {
             verify(mockSessionCallback).onPublishStarted(
-                    (WifiAwarePublishDiscoverySession) discoverySession.capture());
+                    (PublishDiscoverySession) discoverySession.capture());
         } else {
             verify(mockSessionCallback).onSubscribeStarted(
-                    (WifiAwareSubscribeDiscoverySession) discoverySession.capture());
+                    (SubscribeDiscoverySession) discoverySession.capture());
         }
 
         String ns = discoverySession.getValue().createNetworkSpecifier(peerHandle,
@@ -711,7 +712,7 @@ public class WifiAwareDataPathStateManagerTest {
         ArgumentCaptor<IWifiAwareEventCallback> clientProxyCallback = ArgumentCaptor
                 .forClass(IWifiAwareEventCallback.class);
 
-        WifiAwareAttachCallback mockCallback = mock(WifiAwareAttachCallback.class);
+        AttachCallback mockCallback = mock(AttachCallback.class);
 
         mgr.attach(mMockLooperHandler, configRequest, mockCallback, null);
         verify(mMockAwareService).connect(any(IBinder.class), anyString(),
@@ -736,7 +737,7 @@ public class WifiAwareDataPathStateManagerTest {
     }
 
     private Pair<Integer, Messenger> initDataPathEndPoint(int clientId, int pubSubId,
-            WifiAwareManager.PeerHandle peerHandle, byte[] peerDiscoveryMac, InOrder inOrder,
+            PeerHandle peerHandle, byte[] peerDiscoveryMac, InOrder inOrder,
             boolean doPublish)
             throws Exception {
         final int uid = 1000;
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java
index f8371e658..c18e27fcb 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java
@@ -23,10 +23,10 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import android.net.wifi.aware.ConfigRequest;
+import android.net.wifi.aware.DiscoverySessionCallback;
 import android.net.wifi.aware.PublishConfig;
 import android.net.wifi.aware.SubscribeConfig;
 import android.net.wifi.aware.TlvBufferUtils;
-import android.net.wifi.aware.WifiAwareDiscoverySessionCallback;
 import android.os.Bundle;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -663,7 +663,7 @@ public class WifiAwareHalTest {
         WifiAwareHalMock.callPublishTerminated(HalMockUtils.convertBundleToJson(args).toString());
 
         verify(mAwareStateManager).onSessionTerminatedNotification(publishId,
-                WifiAwareDiscoverySessionCallback.TERMINATE_REASON_DONE, true);
+                DiscoverySessionCallback.TERMINATE_REASON_DONE, true);
         verifyNoMoreInteractions(mAwareStateManager);
     }
 
@@ -678,7 +678,7 @@ public class WifiAwareHalTest {
         WifiAwareHalMock.callSubscribeTerminated(HalMockUtils.convertBundleToJson(args).toString());
 
         verify(mAwareStateManager).onSessionTerminatedNotification(subscribeId,
-                WifiAwareDiscoverySessionCallback.TERMINATE_REASON_FAIL, false);
+                DiscoverySessionCallback.TERMINATE_REASON_FAIL, false);
         verifyNoMoreInteractions(mAwareStateManager);
     }
 
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java
index a65c760a6..6f6cacc86 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java
@@ -31,12 +31,12 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.wifi.RttManager;
+import android.net.wifi.aware.Characteristics;
 import android.net.wifi.aware.ConfigRequest;
 import android.net.wifi.aware.IWifiAwareDiscoverySessionCallback;
 import android.net.wifi.aware.IWifiAwareEventCallback;
 import android.net.wifi.aware.PublishConfig;
 import android.net.wifi.aware.SubscribeConfig;
-import android.net.wifi.aware.WifiAwareCharacteristics;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.Looper;
@@ -649,7 +649,7 @@ public class WifiAwareServiceImplTest {
         return clientId.getValue();
     }
 
-    private static WifiAwareCharacteristics getCharacteristics() {
+    private static Characteristics getCharacteristics() {
         WifiAwareNative.Capabilities cap = new WifiAwareNative.Capabilities();
         cap.maxConcurrentAwareClusters = 1;
         cap.maxPublishes = 2;
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
index b4396002d..5ae96d5bb 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
@@ -44,11 +44,11 @@ import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.RttManager;
 import android.net.wifi.aware.ConfigRequest;
+import android.net.wifi.aware.DiscoverySessionCallback;
 import android.net.wifi.aware.IWifiAwareDiscoverySessionCallback;
 import android.net.wifi.aware.IWifiAwareEventCallback;
 import android.net.wifi.aware.PublishConfig;
 import android.net.wifi.aware.SubscribeConfig;
-import android.net.wifi.aware.WifiAwareDiscoverySessionCallback;
 import android.net.wifi.aware.WifiAwareManager;
 import android.os.Message;
 import android.os.UserHandle;
@@ -490,7 +490,7 @@ public class WifiAwareStateManagerTest {
         final int uid = 1000;
         final int pid = 2000;
         final String callingPackage = "com.google.somePackage";
-        final int reasonTerminate = WifiAwareDiscoverySessionCallback.TERMINATE_REASON_DONE;
+        final int reasonTerminate = DiscoverySessionCallback.TERMINATE_REASON_DONE;
         final int publishId = 15;
 
         ConfigRequest configRequest = new ConfigRequest.Builder().build();
@@ -752,7 +752,7 @@ public class WifiAwareStateManagerTest {
         final int uid = 1000;
         final int pid = 2000;
         final String callingPackage = "com.google.somePackage";
-        final int reasonTerminate = WifiAwareDiscoverySessionCallback.TERMINATE_REASON_DONE;
+        final int reasonTerminate = DiscoverySessionCallback.TERMINATE_REASON_DONE;
         final int subscribeId = 15;
 
         ConfigRequest configRequest = new ConfigRequest.Builder().build();
@@ -2053,7 +2053,7 @@ public class WifiAwareStateManagerTest {
         final String serviceName = "some-service-name";
         final String ssi = "some much longer and more arbitrary data";
         final int publishCount = 7;
-        final int reason = WifiAwareDiscoverySessionCallback.TERMINATE_REASON_DONE;
+        final int reason = DiscoverySessionCallback.TERMINATE_REASON_DONE;
         final int publishId = 22;
 
         ConfigRequest configRequest = new ConfigRequest.Builder().setClusterLow(clusterLow)