commit 34b2389fcfa8de7a7373e44cda6cf3b7239d3bd3
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 31 21:43:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 31 21:43:44 2017 +0000
tree 073aa635e68d528aef775306bff97341f9bc7f49
parent 810c312a297d26c81e60553a165fcdbc447ef8ce
parent a26b4357ff3a62d130c3842494ad6420b28006ba

Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev

services/core/java/com/android/server/vr/VrManagerService.java

diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index 447d639..2996878 100644
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -1141,8 +1141,8 @@
     private void setPersistentVrModeEnabled(boolean enabled) {
         synchronized(mLock) {
             setPersistentModeAndNotifyListenersLocked(enabled);
-            // Disabling persistent mode when not showing a VR should disable the overall vr mode.
-            if (!enabled && mCurrentVrModeComponent == null) {
+            // Disabling persistent mode should disable the overall vr mode.
+            if (!enabled) {
                 setVrMode(false, null, 0, -1, null);
             }
         }