Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

Issue 550403002: In AndroidBrowserBackend.Start(), make sure the application is stoped when setting the relaxsslchec… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set relaxsslcheck before stopping browser. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
index 285e41e758ea8a07bd796c0dc5d5cf2af37a53c6..abe17a9e70b0132d94b3fbea2214873c5fcf8e31 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
@@ -197,6 +197,13 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
# allocates. Need to fix this.
self._port = adb_commands.AllocateTestServerPort()
+ # Disables android.net SSL certificate check. This is necessary for
+ # applications using the android.net stack to work with proxy HTTPS server
+ # created by telemetry
+ if self._backend_settings.relax_ssl_check:
+ self._saved_sslflag = self._adb.device().GetProp('socket.relaxsslcheck')
+ self._adb.device().SetProp('socket.relaxsslcheck', 'yes')
+
# Kill old browser.
self._adb.device().ForceStop(self._backend_settings.package)
@@ -272,13 +279,6 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
def Start(self):
self._SetUpCommandLine()
- # Disables android.net SSL certificate check. This is necessary for
- # applications using the android.net stack to work with proxy HTTPS server
- # created by telemetry
- if self._backend_settings.relax_ssl_check:
- self._saved_sslflag = self._adb.device().GetProp('socket.relaxsslcheck')
- self._adb.device().SetProp('socket.relaxsslcheck', 'yes')
-
self._adb.device().RunShellCommand('logcat -c')
if self.browser_options.startup_url:
url = self.browser_options.startup_url
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698