summaryrefslogtreecommitdiff
path: root/build/android/pylib/local/emulator/avd.py
diff options
context:
space:
mode:
Diffstat (limited to 'build/android/pylib/local/emulator/avd.py')
-rw-r--r--build/android/pylib/local/emulator/avd.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/build/android/pylib/local/emulator/avd.py b/build/android/pylib/local/emulator/avd.py
index 1387d9054..6f3a5d46a 100644
--- a/build/android/pylib/local/emulator/avd.py
+++ b/build/android/pylib/local/emulator/avd.py
@@ -556,7 +556,7 @@ class AvdConfig:
# https://bit.ly/3agmjcM).
# Wait for this step to complete since it can take a while for old OSs
# like M, otherwise the avd may have "Encryption Unsuccessful" error.
- instance.device.WaitUntilFullyBooted(decrypt=True, timeout=180, retries=0)
+ instance.device.WaitUntilFullyBooted(decrypt=True, timeout=360, retries=0)
if additional_apks:
for apk in additional_apks:
@@ -884,8 +884,11 @@ class AvdConfig:
with ini.update_ini_file(config_path) as config_contents:
config_contents.update(properties)
- # Create qt config file to disable adb warning when launched in window mode.
+ # Create qt config file to disable certain warnings when launched in window.
with ini.update_ini_file(self._qt_config_path) as config_contents:
+ # Disable nested virtualization warning.
+ config_contents['General'] = {'showNestedWarning': 'false'}
+ # Disable adb warning.
config_contents['set'] = {'autoFindAdb': 'false'}
def _Initialize(self):