| Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| index 470b8fee24bb8d89551590c8d2f20aa21f6111a7..641a4e73e66c73a708afbbdae9fa038e47422f5b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| @@ -276,6 +276,7 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr
|
| @Override
|
| public void onResume() {
|
| super.onResume();
|
| + mGlSurfaceView.onResume();
|
| if (mNativeVrShell != 0) {
|
| // Refreshing the viewer profile accesses disk, so we need to temporarily allow disk
|
| // reads. The GVR team promises this will be fixed when they launch.
|
| @@ -291,6 +292,7 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr
|
| @Override
|
| public void onPause() {
|
| super.onPause();
|
| + mGlSurfaceView.onPause();
|
| if (mNativeVrShell != 0) {
|
| nativeOnPause(mNativeVrShell);
|
| }
|
| @@ -300,6 +302,8 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr
|
| public void shutdown() {
|
| super.shutdown();
|
| if (mNativeVrShell != 0) {
|
| + // Ensure our GL thread is stopped before we destroy the native VR Shell.
|
| + mGlSurfaceView.onPause();
|
| nativeDestroy(mNativeVrShell);
|
| mNativeVrShell = 0;
|
| }
|
|
|