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

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

Issue 2707803003: Fix Initializing VrShellImpl can throw a NullPointerException. (Closed)
Patch Set: Rebase Created 3 years, 10 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: 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 8e3a6b3baead5999469e0e736a035f05c86fc1d3..b6c4bd450bbbb711d1132cbd013a9cf25fe2e078 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
@@ -409,6 +409,9 @@ public class VrShellDelegate {
}
private void enterVR() {
+ if (mEnteringVr) {
+ mEnteringVr = false;
+ }
if (mRestoreSystemUiVisibilityFlag == -1
|| mActivity.getResources().getConfiguration().orientation
!= Configuration.ORIENTATION_LANDSCAPE) {
@@ -421,7 +424,6 @@ public class VrShellDelegate {
});
return;
}
- mEnteringVr = false;
if (!createVrShell()) {
if (mRestoreOrientation != null) mActivity.setRequestedOrientation(mRestoreOrientation);
mRestoreOrientation = null;
« 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