Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev (34b2389f) · Commits · e / os / android_frameworks_base

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);
		}
		}