OSDN Git Service

Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent
authorMakoto Onuki <omakoto@google.com>
Mon, 13 Jun 2016 21:50:11 +0000 (14:50 -0700)
committerMakoto Onuki <omakoto@google.com>
Tue, 14 Jun 2016 16:41:21 +0000 (09:41 -0700)
commit26704957fe48d75a5b4f3a51cff520a9e4d8b82c
tree628d701b61408b2736ef6d4a9fd04bf63f996dd2
parentf419bd9e03574d63581694f646f1b1136e7574d8
Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent

This method is called by AM with the lock held, so can't take the
DPMS lock.

It still takes a different lock, but we don't call into the external
world while holding this lock, so this is fine.

Bug 29242568

Change-Id: Idbecdd7d97385ca66c693903443471fdbae833e6
core/java/android/app/admin/DevicePolicyManagerInternal.java
services/core/java/com/android/server/am/ActivityStartInterceptor.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
services/devicepolicy/java/com/android/server/devicepolicy/Owners.java