OSDN Git Service

Fix VR interaction with screen on/off/lockscreen.
authorRuben Brunk <rubenbrunk@google.com>
Sat, 29 Oct 2016 03:18:57 +0000 (20:18 -0700)
committerRuben Brunk <rubenbrunk@google.com>
Wed, 14 Dec 2016 02:26:08 +0000 (18:26 -0800)
commitdfe0d7157da8e8a40ee86f0875531bfe2d657831
tree29bf511412b0672c211f8a09f00c550d3b15c787
parent201708ad89d5fa32e44afe5c4a9a2cacd5f800dc
Fix VR interaction with screen on/off/lockscreen.

- Add mechanism to prevent VR mode from being enabled.
- Disable VR mode while screen is off, or user is in lockscreen,
  and re-enable when this is no longer the case.

Test: Fix merge from nyc-mr2-dev.

Bug: 31665197
Change-Id: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/KeyguardController.java
services/core/java/com/android/server/policy/PhoneWindowManager.java
services/core/java/com/android/server/vr/VrManagerInternal.java
services/core/java/com/android/server/vr/VrManagerService.java