From 346856ab46b0d76c381dff0e97274bd31e72910b Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Fri, 9 Mar 2018 16:38:27 -0800 Subject: [PATCH] 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 99684e8de4..57ea2a5da8 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.BroadcastReceiver; 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 @@ public class TestBase extends AndroidTestCase { * 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