Commit 3910fcab authored by wuhu's avatar wuhu Committed by Commit bot

Set the relaxsslcheck flag before stopping the browser.

BUG=

Review URL: https://codereview.chromium.org/550403002

Cr-Commit-Position: refs/heads/master@{#293872}
parent 1953007c
...@@ -197,6 +197,13 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): ...@@ -197,6 +197,13 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
# allocates. Need to fix this. # allocates. Need to fix this.
self._port = adb_commands.AllocateTestServerPort() 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. # Kill old browser.
self._adb.device().ForceStop(self._backend_settings.package) self._adb.device().ForceStop(self._backend_settings.package)
...@@ -272,13 +279,6 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): ...@@ -272,13 +279,6 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
def Start(self): def Start(self):
self._SetUpCommandLine() 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') self._adb.device().RunShellCommand('logcat -c')
if self.browser_options.startup_url: if self.browser_options.startup_url:
url = self.browser_options.startup_url url = self.browser_options.startup_url
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment