commit 346856ab46b0d76c381dff0e97274bd31e72910b
author Etan Cohen <etancohen@google.com> Fri Mar 09 16:38:27 2018 -0800
committer Etan Cohen <etancohen@google.com> Wed May 16 15:31:57 2018 -0700
tree f70686a20cb21d339b5652d682c90c73b2b78c2e
parent 01d63b603e1101ae06b9d3f257c7bbf1a930ff6b

Revert "[RTT] Disable RTT CTS"

This reverts commit 14c32a88c15f2e00647a226c1e670967a683dcf7.

Enable Wi-Fi RTT CTS in production.

Bug: b/74457054
Test: atest CtsNetTestCases:WifiRttTest
Change-Id: Ia60776dbf60406d3665b01c7fecb3c9cd1a6c8ee

tests/cts/net/src/android/net/wifi/rtt/cts/TestBase.java

diff --git a/tests/cts/net/src/android/net/wifi/rtt/cts/TestBase.java b/tests/cts/net/src/android/net/wifi/rtt/cts/TestBase.java
index 99684e8..57ea2a5 100644
--- a/tests/cts/net/src/android/net/wifi/rtt/cts/TestBase.java
+++ b/tests/cts/net/src/android/net/wifi/rtt/cts/TestBase.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.location.LocationManager;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
@@ -66,10 +67,8 @@
      * should be tested if the feature is supported on the current device.
      */
     static boolean shouldTestWifiRtt(Context context) {
-        // TODO b/74457054: enable when t/31350604 resolved
-        return false;
-//        final PackageManager pm = context.getPackageManager();
-//        return pm.hasSystemFeature(PackageManager.FEATURE_WIFI_RTT);
+        final PackageManager pm = context.getPackageManager();
+        return pm.hasSystemFeature(PackageManager.FEATURE_WIFI_RTT);
     }
 
     @Override