Merge "WifiStateMachine: Mask RTT capabilities against System Properties" am: a78a579804 am: 21b6b83067 am: 8c0d84239a

am: dd25b8603d

Change-Id: Ic0a06fdcb8536389682c0da0ac877e73a109bc1b
(cherry picked from commit 0703e1b30fbe529fe7d015802a4c9f2f56885cf9)

1 files changed, 40 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 53d8f46aa..636c93d87 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -1214,4 +1214,44 @@ public class WifiStateMachineTest {
         mWsm.enableVerboseLogging(1);
         verify(mPropertyService, never()).set(anyString(), anyString());
     }
+
+    private int testGetSupportedFeaturesCase(int supportedFeatures, boolean rttConfigured) {
+        AsyncChannel channel = mock(AsyncChannel.class);
+        Message reply = Message.obtain();
+        reply.arg1 = supportedFeatures;
+        reset(mPropertyService);  // Ignore calls made in setUp()
+        when(channel.sendMessageSynchronously(WifiStateMachine.CMD_GET_SUPPORTED_FEATURES))
+                .thenReturn(reply);
+        when(mPropertyService.getBoolean("config.disable_rtt", false))
+                .thenReturn(rttConfigured);
+        return mWsm.syncGetSupportedFeatures(channel);
+    }
+
+    /** Verifies that syncGetSupportedFeatures() masks out capabilities based on system flags. */
+    @Test
+    public void syncGetSupportedFeatures() {
+        final int featureNan = WifiManager.WIFI_FEATURE_NAN;
+        final int featureInfra = WifiManager.WIFI_FEATURE_INFRA;
+        final int featureD2dRtt = WifiManager.WIFI_FEATURE_D2D_RTT;
+        final int featureD2apRtt = WifiManager.WIFI_FEATURE_D2AP_RTT;
+
+        assertEquals(0, testGetSupportedFeaturesCase(0, false));
+        assertEquals(0, testGetSupportedFeaturesCase(0, true));
+        assertEquals(featureNan | featureInfra,
+                testGetSupportedFeaturesCase(featureNan | featureInfra, false));
+        assertEquals(featureNan | featureInfra,
+                testGetSupportedFeaturesCase(featureNan | featureInfra, true));
+        assertEquals(featureInfra | featureD2dRtt,
+                testGetSupportedFeaturesCase(featureInfra | featureD2dRtt, false));
+        assertEquals(featureInfra,
+                testGetSupportedFeaturesCase(featureInfra | featureD2dRtt, true));
+        assertEquals(featureInfra | featureD2apRtt,
+                testGetSupportedFeaturesCase(featureInfra | featureD2apRtt, false));
+        assertEquals(featureInfra,
+                testGetSupportedFeaturesCase(featureInfra | featureD2apRtt, true));
+        assertEquals(featureInfra | featureD2dRtt | featureD2apRtt,
+                testGetSupportedFeaturesCase(featureInfra | featureD2dRtt | featureD2apRtt, false));
+        assertEquals(featureInfra,
+                testGetSupportedFeaturesCase(featureInfra | featureD2dRtt | featureD2apRtt, true));
+    }
 }