LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[AWARE] Update CTS for (new) Aware Location Mode behavior"

Browse Source
This commit is contained in:
Etan Cohen
2018-03-02 15:48:23 +00:00
committed by Android (Google) Code Review
parent 618eb894c9 aca8ac117e
commit c548e56342
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
View File

@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.location.LocationManager;
import android.net.ConnectivityManager;
import android.net.MacAddress;
import android.net.NetworkCapabilities;
@@ -38,9 +39,7 @@ import android.net.wifi.aware.WifiAwareManager;
import android.net.wifi.aware.WifiAwareSession;
import android.os.Handler;
import android.os.HandlerThread;
import android.provider.Settings;
import android.test.AndroidTestCase;
import android.util.Log;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -76,13 +75,6 @@ public class SingleDeviceTest extends AndroidTestCase {
// used to store any WifiAwareSession allocated during tests - will clean-up after tests
private List<WifiAwareSession> mSessions = new ArrayList<>();
// Return true if location is enabled.
private boolean isLocationEnabled() {
return Settings.Secure.getInt(getContext().getContentResolver(),
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF) !=
Settings.Secure.LOCATION_MODE_OFF;
}
private class WifiAwareBroadcastReceiver extends BroadcastReceiver {
private CountDownLatch mBlocker = new CountDownLatch(1);
@@ -358,6 +350,10 @@ public class SingleDeviceTest extends AndroidTestCase {
return;
}
assertTrue("Wi-Fi Aware requires Location to be Enabled",
((LocationManager) getContext().getSystemService(
Context.LOCATION_SERVICE)).isLocationEnabled());
mWifiAwareManager = (WifiAwareManager) getContext().getSystemService(
Context.WIFI_AWARE_SERVICE);
assertNotNull("Wi-Fi Aware Manager", mWifiAwareManager);
@@ -431,18 +427,6 @@ public class SingleDeviceTest extends AndroidTestCase {
return;
}
if (isLocationEnabled()) {
/* Can't execute this test with location on since it means that Aware will not get
* disabled even if we disable Wi-Fi (which when location is enabled does not correspond
* to disabling the Wi-Fi chip).
*
* Considering other tests may require locationing to be enable we can't also fail the
* test in such a case. Hence it is skipped.
*/
Log.d(TAG, "Skipping test since location scans are enabled");
return;
}
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(WifiAwareManager.ACTION_WIFI_AWARE_STATE_CHANGED);