commit 320104e7cc20e33d4d9dcab0b75be39b3c6b7ed7
author Remi NGUYEN VAN <reminv@google.com> Thu Apr 30 07:42:08 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 30 07:42:08 2020 +0000
tree 3bf7b5b046a6d36f89d6408ae813a30396ab1227
parent 70285ea6d98dd7f7029f6cb5c68d6a40533dec56
parent 33a88fbf5f5260700c835656f19b5fd2806b6f66

Merge "Force reconnect in connectToWifi" into rvc-dev

tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java

diff --git a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
index 6214f89..824146f 100644
--- a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
+++ b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
@@ -16,6 +16,7 @@
 
 package android.net.cts.util;
 
+import static android.Manifest.permission.NETWORK_SETTINGS;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
 
@@ -107,6 +108,8 @@
         boolean connected = false;
         try {
             SystemUtil.runShellCommand("svc wifi enable");
+            SystemUtil.runWithShellPermissionIdentity(() -> mWifiManager.reconnect(),
+                    NETWORK_SETTINGS);
             // Ensure we get both an onAvailable callback and a CONNECTIVITY_ACTION.
             wifiNetwork = callback.waitForAvailable();
             assertNotNull(wifiNetwork);