OSDN Git Service

Merge "Do not call into ActivityManager from DPMS within DPMS lock"
authorMakoto Onuki <omakoto@google.com>
Tue, 10 Nov 2015 22:57:05 +0000 (22:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 Nov 2015 22:57:05 +0000 (22:57 +0000)
commit246b5a0993978202b19a7c02d355fddfd9506798
tree274439662d7360829c346d91c61ef77e88ec7a5d
parentf9ca399362dfba15b25f4348033eee9624363aed
parent53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd
Merge "Do not call into ActivityManager from DPMS within DPMS lock"
core/java/android/app/ActivityManagerNative.java
core/java/android/app/IActivityManager.java
core/java/android/app/admin/DevicePolicyManager.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java