219bbafc3fa40dae163d652365cc4a97d613011f - platform/frameworks/base

commit	219bbafc3fa40dae163d652365cc4a97d613011f	[log] [tgz]
author	Makoto Onuki <omakoto@google.com>	Thu Nov 12 01:38:47 2015 +0000
committer	Makoto Onuki <omakoto@google.com>	Thu Nov 12 01:38:47 2015 +0000
tree	6fcbd2ee0470240ed0a51eaaebadec23246b304b
parent	53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd [diff]

Revert "Do not call into ActivityManager from DPMS within DPMS lock"

Bug 25567963

This reverts commit 53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd.

Change-Id: I4faaa0b4c50d75e208f37b99bc1d6e2f0fff8127

core/java/android/app/ActivityManagerNative.java[diff]
core/java/android/app/IActivityManager.java[diff]
core/java/android/app/admin/DevicePolicyManager.java[diff]
core/java/android/app/admin/DevicePolicyManagerInternal.java[diff]
services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java[diff]

8 files changed

tree: 6fcbd2ee0470240ed0a51eaaebadec23246b304b