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

Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev

Browse Source 
am: 9b53851d58

Change-Id: I73f621eae44bc8cac298d9772b41c5d93eaa185e
This commit is contained in:
Alex Sakhartchouk
2017-07-25 14:09:10 +00:00
committed by android-build-merger
parent 2d8b3ec7c3 9b53851d58
commit a3115fb0a5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -785,7 +785,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC
} }
if ((calling != null || mPersistentVrModeEnabled) if ((calling != null || mPersistentVrModeEnabled)
&& !Objects.equals(calling, mCurrentVrModeComponent)) { && !Objects.equals(calling, mCurrentVrModeComponent)
|| mRunning2dInVr != running2dInVr) {
sendUpdatedCaller = true; sendUpdatedCaller = true;
} }
mCurrentVrModeComponent = calling; mCurrentVrModeComponent = calling;