Snap for 6667917 from 238ae1a43a404ff42865809b0ec1181eed1571d3 to rvc-d1-release

Change-Id: I9e62a738017a3b5253e7397bf671b2c58583690d

1 files changed, 6 insertions, 1 deletions

diff --git a/java/test/settings/src/com/google/android/chre/test/setting/ContextHubWifiSettingsTestExecutor.java b/java/test/settings/src/com/google/android/chre/test/setting/ContextHubWifiSettingsTestExecutor.java
index ae3a09b7..50d740dd 100644
--- a/java/test/settings/src/com/google/android/chre/test/setting/ContextHubWifiSettingsTestExecutor.java
+++ b/java/test/settings/src/com/google/android/chre/test/setting/ContextHubWifiSettingsTestExecutor.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.hardware.location.NanoAppBinary;
 import android.net.wifi.WifiManager;
+import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
 
@@ -37,6 +38,7 @@ import java.util.concurrent.TimeUnit;
  * A test to check for behavior when WiFi settings are changed.
  */
 public class ContextHubWifiSettingsTestExecutor {
+    private static final String TAG = "ContextHubWifiSettingsTestExecutor";
     private final ContextHubSettingsTestExecutor mExecutor;
 
     private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
@@ -87,6 +89,9 @@ public class ContextHubWifiSettingsTestExecutor {
         mInitialLocationEnabled = mSettingsUtil.isLocationEnabled();
         mInitialWifiEnabled = mSettingsUtil.isWifiEnabled();
         mInitialWifiScanningAlwaysEnabled = mSettingsUtil.isWifiScanningAlwaysEnabled();
+        Log.d(TAG, "isLocationEnalbed=" + mInitialLocationEnabled
+                + ", isWifiEnabled=" + mInitialWifiEnabled
+                + ", isWifiScanningAlwaysEnabled=" + mInitialWifiScanningAlwaysEnabled);
         mExecutor.init();
     }
 
@@ -127,7 +132,7 @@ public class ContextHubWifiSettingsTestExecutor {
             wifiUpdateListener.mWifiLatch.await(30, TimeUnit.SECONDS);
 
             // Wait a few seconds to ensure setting is propagated to CHRE path
-            Thread.sleep(5000);
+            Thread.sleep(10000);
         } catch (InterruptedException e) {
             Assert.fail(e.getMessage());
         }