Merge "[AWARE] Fix WifiAware NonConcurrency status"

3 files changed, 34 insertions, 0 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 f2cc45fef..647f11d21 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -163,6 +163,7 @@ public class WifiAwareDataPathStateManagerTest {
         // allows older (more extrensive) tests to run.
         when(mWifiPermissionsUtil.isTargetSdkLessThan(anyString(), anyInt())).thenReturn(true);
         when(mWifiPermissionsUtil.isLocationModeEnabled()).thenReturn(true);
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(true);
 
         mDut = new WifiAwareStateManager();
         mDut.setNative(mMockNativeManager, mMockNative);
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java
index 140e7e43c..f6240c8a4 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java
@@ -18,6 +18,7 @@ package com.android.server.wifi.aware;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.inOrder;
@@ -289,5 +290,9 @@ public class WifiAwareNativeManagerTest {
                 any());
         mInOrder.verify(mIWifiNanIface12Mock).registerEventCallback_1_2(any());
         assertEquals("Interface mismatch", mIWifiNanIface12Mock, mDut.getWifiNanIface());
+
+        // 3. receive Availability Change, has interface, should ignore
+        mAvailListenerCaptor.getValue().onAvailabilityChanged(false);
+        assertTrue("AwareNativeAvailable mismatch ", mDut.isAwareNativeAvailable());
     }
 }
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 6714bfb1d..3d48a23b7 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
@@ -165,6 +165,7 @@ public class WifiAwareStateManagerTest {
         when(mMockPowerManager.isDeviceIdleMode()).thenReturn(false);
         when(mMockPowerManager.isInteractive()).thenReturn(true);
         when(mWifiPermissionsUtil.isLocationModeEnabled()).thenReturn(true);
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(true);
 
         ArgumentCaptor<BroadcastReceiver> bcastRxCaptor = ArgumentCaptor.forClass(
                 BroadcastReceiver.class);
@@ -3273,6 +3274,7 @@ public class WifiAwareStateManagerTest {
         inOrder.verify(mMockNativeManager).start(any(Handler.class));
 
         mDut.enableUsage();
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
         mMockLooper.dispatchAll();
         inOrder.verify(mMockNativeManager).tryToGetAware();
         inOrder.verify(mMockNative).getCapabilities(transactionId.capture());
@@ -3312,8 +3314,16 @@ public class WifiAwareStateManagerTest {
         simulateWifiStateChange(true);
         mMockLooper.dispatchAll();
 
+        // when WifiAware Native is not available, DOZE OFF -> no change
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(false);
+        simulatePowerStateChangeDoze(false);
+        mMockLooper.dispatchAll();
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(true);
+
         // (5) power state change: DOZE OFF
         simulatePowerStateChangeDoze(false);
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
         mMockLooper.dispatchAll();
         collector.checkThat("usage enabled", mDut.isUsageEnabled(), equalTo(true));
         validateCorrectAwareStatusChangeBroadcast(inOrder);
@@ -3339,6 +3349,7 @@ public class WifiAwareStateManagerTest {
         inOrder.verify(mMockNativeManager).start(any(Handler.class));
 
         mDut.enableUsage();
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
         mMockLooper.dispatchAll();
         inOrder.verify(mMockNativeManager).tryToGetAware();
         inOrder.verify(mMockNative).getCapabilities(transactionId.capture());
@@ -3374,8 +3385,16 @@ public class WifiAwareStateManagerTest {
         simulateWifiStateChange(true);
         mMockLooper.dispatchAll();
 
+        // when WifiAware Native is not available, enable location -> no change
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(false);
+        simulateLocationModeChange(true);
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
+        mMockLooper.dispatchAll();
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(true);
+
         // (4) location mode change: enable
         simulateLocationModeChange(true);
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
         mMockLooper.dispatchAll();
         collector.checkThat("usage enabled", mDut.isUsageEnabled(), equalTo(true));
         validateCorrectAwareStatusChangeBroadcast(inOrder);
@@ -3401,6 +3420,7 @@ public class WifiAwareStateManagerTest {
         inOrder.verify(mMockNativeManager).start(any(Handler.class));
 
         mDut.enableUsage();
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
         mMockLooper.dispatchAll();
         inOrder.verify(mMockNativeManager).tryToGetAware();
         inOrder.verify(mMockNative).getCapabilities(transactionId.capture());
@@ -3436,8 +3456,16 @@ public class WifiAwareStateManagerTest {
         simulateLocationModeChange(true);
         mMockLooper.dispatchAll();
 
+        // when WifiAware Native is not available, enable Wifi -> no change
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(false);
+        simulateWifiStateChange(true);
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
+        mMockLooper.dispatchAll();
+        when(mMockNativeManager.isAwareNativeAvailable()).thenReturn(true);
+
         // (4) wifi state change: enable
         simulateWifiStateChange(true);
+        inOrder.verify(mMockNativeManager).isAwareNativeAvailable();
         mMockLooper.dispatchAll();
         collector.checkThat("usage enabled", mDut.isUsageEnabled(), equalTo(true));
         validateCorrectAwareStatusChangeBroadcast(inOrder);