Fix VR interaction with screen on/off/lockscreen.

author Ruben Brunk <rubenbrunk@google.com>

Wed, 14 Dec 2016 08:27:58 +0000 (08:27 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 14 Dec 2016 08:27:58 +0000 (08:27 +0000)
author Ruben Brunk <rubenbrunk@google.com>
Wed, 14 Dec 2016 08:27:58 +0000 (08:27 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 08:27:58 +0000 (08:27 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
diff --cc services/core/java/com/android/server/vr/VrManagerService.java
Simple merge
author	Ruben Brunk <rubenbrunk@google.com>
	Wed, 14 Dec 2016 08:27:58 +0000 (08:27 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 14 Dec 2016 08:27:58 +0000 (08:27 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/policy/PhoneWindowManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/vr/VrManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history