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

CtsNetTestCases: fix Wifi @hide usages

Browse Source 
Remove CTS @hide Wifi API usages.

Bug: 144036594
Test: atest CtsNetTestCases
Change-Id: I88de956a56f81212133d1da48d5217b282bc10c1
This commit is contained in:
David Su
2019-12-17 18:41:56 -08:00
parent f7d2ff895e
commit 656e4768c3
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -34,9 +34,6 @@ import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.TxPacketCountListener;
import android.net.wifi.WifiManager.WifiLock;
import android.net.wifi.hotspot2.PasspointConfiguration;
import android.net.wifi.hotspot2.pps.Credential;
import android.net.wifi.hotspot2.pps.HomeSp;
import android.os.Process;
import android.os.SystemClock;
import android.os.UserHandle;
@@ -55,9 +52,6 @@ import com.android.compatibility.common.util.SystemUtil;
import java.lang.StringBuilder;
import java.net.HttpURLConnection;
import java.net.URL;
import java.security.MessageDigest;
import java.security.cert.X509Certificate;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -232,21 +226,14 @@ public class WifiManagerTest extends AndroidTestCase {
// Get the current scan status from sticky broadcast.
private boolean isScanCurrentlyAvailable() {
boolean isAvailable = false;
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(WifiManager.WIFI_SCAN_AVAILABLE);
intentFilter.addAction(WifiManager.ACTION_WIFI_SCAN_AVAILABLE);
Intent intent = mContext.registerReceiver(null, intentFilter);
assertNotNull(intent);
if (intent.getAction().equals(WifiManager.WIFI_SCAN_AVAILABLE)) {
int state = intent.getIntExtra(
WifiManager.EXTRA_SCAN_AVAILABLE, WifiManager.WIFI_STATE_UNKNOWN);
if (state == WifiManager.WIFI_STATE_ENABLED) {
isAvailable = true;
} else if (state == WifiManager.WIFI_STATE_DISABLED) {
isAvailable = false;
}
if (intent.getAction().equals(WifiManager.ACTION_WIFI_SCAN_AVAILABLE)) {
return intent.getBooleanExtra(WifiManager.EXTRA_SCAN_AVAILABLE, false);
}
return isAvailable;
return false;
}
private void startScan() throws Exception {

4
tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
View File

@@ -16,6 +16,8 @@
package android.net.wifi.rtt.cts;
import static org.mockito.Mockito.mock;
import android.net.wifi.ScanResult;
import android.net.wifi.rtt.RangingRequest;
import android.net.wifi.rtt.RangingResult;
@@ -185,7 +187,7 @@ public class WifiRttTest extends TestBase {
return;
}
ScanResult dummy = new ScanResult();
ScanResult dummy = mock(ScanResult.class);
dummy.BSSID = "00:01:02:03:04:05";
RangingRequest.Builder builder = new RangingRequest.Builder();