fecb615093e9781309efcc4d51ffb1808f26415d - platform/frameworks/base

commit	fecb615093e9781309efcc4d51ffb1808f26415d	[log] [tgz]
author	Ruben Brunk <rubenbrunk@google.com>	Fri Oct 28 20:18:57 2016 -0700
committer	Ruben Brunk <rubenbrunk@google.com>	Thu Dec 15 20:56:23 2016 -0800
tree	c0fd20500dc9875fcce5126eb8004c1b98f7eda7
parent	3bd405bd72cd2b7b28bdf4402e36cf747b3cf454 [diff]

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
Bug: 33655854
Change-Id: If777e0ef40b29bff42722f2aa10cff86a5831bc0

services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/core/java/com/android/server/am/KeyguardController.java[diff]
services/core/java/com/android/server/policy/PhoneWindowManager.java[diff]
services/core/java/com/android/server/vr/VrManagerInternal.java[diff]
services/core/java/com/android/server/vr/VrManagerService.java[diff]

5 files changed

tree: c0fd20500dc9875fcce5126eb8004c1b98f7eda7