From a26b4357ff3a62d130c3842494ad6420b28006ba Mon Sep 17 00:00:00 2001
From: Alex Sakhartchouk <alexst@google.com>
Date: Tue, 25 Jul 2017 17:08:43 -0400
Subject: [PATCH] When exiting persistent vr, we should exit overall vr mode.

Bug: 64026789
Test: adb shell vr set-persistent-vr-mode-enabled false exits vr app
Change-Id: I009ac10f65561cac8ec1824618214a847823344a
---
 .../core/java/com/android/server/vr/VrManagerService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index 447d639f31b37..29968781b26d6 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 @@ public class VrManagerService extends SystemService implements EnabledComponentC
     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);
             }
         }