commit 7e169d4274d9ce9c3d6d557e27e52056726c3191
author Treehugger Robot <treehugger-gerrit@google.com> Sat Oct 16 00:26:30 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 16 00:26:30 2021 +0000
tree 13367b3ced5cc464737b43b964b495d0eb3704e9
parent 8cfd6bf8c84cf5e63dd0f6b20ffeb49f03e06659
parent dc36dd38b6905ea4a0f4f04dccd39503e3fc79c4

Merge changes I5b58a75f,I07d9c70a into android12-tests-dev

* changes:
  wifi: extending framework restart waiting time
  wifi: remove disable_framework option to pass the stopWifiFramework procedure

wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp

diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
index 8cb7e22..114fe4f 100644
--- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
+++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
@@ -317,7 +317,7 @@
 }
 
 bool waitForFrameworkReady() {
-    int waitCount = 10;
+    int waitCount = 15;
     do {
         // Check whether package service is ready or not.
         if (!testing::checkSubstringInCommandOutput(

wifi/supplicant/1.4/vts/functional/Android.bp

diff --git a/wifi/supplicant/1.4/vts/functional/Android.bp b/wifi/supplicant/1.4/vts/functional/Android.bp
index 8cbe04f..57ee830 100644
--- a/wifi/supplicant/1.4/vts/functional/Android.bp
+++ b/wifi/supplicant/1.4/vts/functional/Android.bp
@@ -77,7 +77,6 @@
         "general-tests",
         "vts",
     ],
-    disable_framework: true,
 }
 
 cc_test {
@@ -108,5 +107,4 @@
         "general-tests",
         "vts",
     ],
-    disable_framework: true,
 }