Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73b51ac4 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by android-build-merger
Browse files

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

am: 34b2389f

Change-Id: Idfba4f8c58f302f40de4826f034914f430ab3382
parents 86271b57 34b2389f

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

            }

        }