chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java - Issue 2746453003: Fix several issues with VR instrumentation tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

Issue 2746453003: Fix several issues with VR instrumentation tests (Closed)

Patch Set: Disable strict mode Created 3 years, 9 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

« build/android/pylib/local/device/local_device_instrumentation_test_run.py ('K') | « build/android/pylib/local/device/local_device_instrumentation_test_run.py ('k') | chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

index 2c36264b3ed909097c43aef7faeb8855c8096c2a..e181dcb617739bb557ea1a6f002d93788eb8ef17 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

@@ -714,7 +714,12 @@ public class VrShellDelegate {

if (mVrClassesWrapper == null) return false;

mTabModelSelector = mActivity.getCompositorViewHolder().detachForVR();

if (mTabModelSelector == null) return false;

- mVrShell = mVrClassesWrapper.createVrShell(mActivity, this, mTabModelSelector);

+ StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();

+ try {

+ mVrShell = mVrClassesWrapper.createVrShell(mActivity, this, mTabModelSelector);

+ } finally {

+ StrictMode.setThreadPolicy(oldPolicy);

+ }

return mVrShell != null;

}