Make sure display is released between activities and kill process bet…

…ween runs to prevent WebVR crash
MozillaReality · Sep 15, 2018 · 26cf841 · 26cf841
1 parent 5d0e8eb
commit 26cf841
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -217,6 +217,8 @@ protected void onDestroy() {
 
         SessionStore.get().clearListeners();
         super.onDestroy();
+        // FIXME: HACK TO KILL GECKO BETWEEN RUNS.
+        android.os.Process.killProcess(android.os.Process.myPid());
     }
 
     @Override

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/BrowserWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/BrowserWidget.java
@@ -113,6 +113,8 @@ public void setSurfaceTexture(SurfaceTexture aTexture, final int aWidth, final i
         mSurface = new Surface(aTexture);
         if (mDisplay == null) {
             mDisplay = session.acquireDisplay();
+        } else {
+            Log.e(LOGTAG, "GeckoDisplay was not null in BrowserWidget.setSurfaceTexture()");
         }
         mDisplay.surfaceChanged(mSurface, aWidth, aHeight);
     }
@@ -180,6 +182,11 @@ public void releaseWidget() {
         if (session == null) {
             return;
         }
+        if (mDisplay != null) {
+            mDisplay.surfaceDestroyed();
+            session.releaseDisplay(mDisplay);
+            mDisplay = null;
+        }
         session.getTextInput().setView(null);
     }
 
@@ -219,6 +226,7 @@ public void onCurrentSessionChange(GeckoSession aSession, int aId) {
             oldSession.getTextInput().setView(null);
             mDisplay.surfaceDestroyed();
             oldSession.releaseDisplay(mDisplay);
+            mDisplay = null;
         }
 
         mSessionId = aId;