[NAN] API changes/fixes addressing apilint issues

Bug: 30983968
Change-Id: Ie48e1d36f51d59e4f32e7b71c622dd42469820a4

3 files changed, 10 insertions, 10 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanDataPathStateManagerTest.java
index f9ffcbee8..fa895ee16 100644
--- a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanDataPathStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanDataPathStateManagerTest.java
@@ -607,7 +607,7 @@ public class WifiNanDataPathStateManagerTest {
         when(mMockNanService.connect(any(IBinder.class), anyString(),
                 any(IWifiNanEventCallback.class), any(ConfigRequest.class))).thenReturn(clientId);
 
-        mgr.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mgr.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         verify(mMockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
@@ -648,7 +648,7 @@ public class WifiNanDataPathStateManagerTest {
         when(mMockNanService.connect(any(IBinder.class), anyString(),
                 any(IWifiNanEventCallback.class), any(ConfigRequest.class))).thenReturn(clientId);
 
-        mgr.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mgr.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         verify(mMockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
diff --git a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanManagerTest.java b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanManagerTest.java
index dd629138e..797d834e0 100644
--- a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanManagerTest.java
@@ -297,7 +297,7 @@ public class WifiNanManagerTest {
                 .forClass(WifiNanPublishSession.class);
 
         // (0) connect + success
-        mDut.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mDut.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         inOrder.verify(mockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
@@ -376,7 +376,7 @@ public class WifiNanManagerTest {
                 .forClass(WifiNanPublishSession.class);
 
         // (1) connect successfully
-        mDut.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mDut.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         inOrder.verify(mockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
@@ -431,7 +431,7 @@ public class WifiNanManagerTest {
                 .forClass(WifiNanSubscribeSession.class);
 
         // (0) connect + success
-        mDut.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mDut.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         inOrder.verify(mockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
@@ -510,7 +510,7 @@ public class WifiNanManagerTest {
                 .forClass(WifiNanSubscribeSession.class);
 
         // (1) connect successfully
-        mDut.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mDut.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         inOrder.verify(mockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
@@ -885,7 +885,7 @@ public class WifiNanManagerTest {
                 .forClass(RttManager.RttResult[].class);
 
         // (1) connect successfully
-        mDut.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mDut.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         inOrder.verify(mockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
@@ -959,7 +959,7 @@ public class WifiNanManagerTest {
                 mockPublishSession, mockRttListener);
 
         // (1) connect successfully
-        mDut.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mDut.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         inOrder.verify(mockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
@@ -1019,7 +1019,7 @@ public class WifiNanManagerTest {
                 mockPublishSession, mockRttListener);
 
         // (1) connect successfully
-        mDut.connect(mMockLooper.getLooper(), mockCallback, configRequest);
+        mDut.connect(mMockLooper.getLooper(), configRequest, mockCallback);
         inOrder.verify(mockNanService).connect(any(IBinder.class), anyString(),
                 clientProxyCallback.capture(), eq(configRequest));
         clientProxyCallback.getValue().onConnectSuccess();
diff --git a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java
index 7624a749b..b2f6385ed 100644
--- a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java
@@ -2491,7 +2491,7 @@ public class WifiNanStateManagerTest {
         inOrder.verify(mMockContext).sendBroadcastAsUser(intent.capture(), eq(UserHandle.ALL));
 
         collector.checkThat("intent action", intent.getValue().getAction(),
-                equalTo(WifiNanManager.WIFI_NAN_STATE_CHANGED_ACTION));
+                equalTo(WifiNanManager.ACTION_WIFI_NAN_STATE_CHANGED));
         collector.checkThat("intent contains wifi status key",
                 intent.getValue().getExtras().containsKey(WifiNanManager.EXTRA_WIFI_STATE),
                 equalTo(true));