Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 34b2389fcf

Change-Id: Idfba4f8c58f302f40de4826f034914f430ab3382
This commit is contained in:
Alex Sakhartchouk
2017-07-31 21:48:24 +00:00
committed by android-build-merger
parent 86271b573a 34b2389fcf
commit 73b51ac40d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/vr/VrManagerService.java
View File

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