OSDN Git Service

Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
authorMakoto Onuki <omakoto@google.com>
Thu, 15 Mar 2018 21:01:49 +0000 (21:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Mar 2018 21:01:49 +0000 (21:01 +0000)
commit70d24a0b1f6ef671dd51b1303309271faf5a754b
tree23f7af60a57c14f28d659b5f4796235a92c574e9
parenta46e4d105905c255af66530c81d93bb71531df46
parent04ef44761dae112d443ffc7ada4a170b956fcd97
Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/wm/WindowManagerService.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java