OSDN Git Service

DO NOT MERGE Do not call RecoverySystem with DPMS lock held
authorSuprabh Shukla <suprabh@google.com>
Tue, 31 Jan 2017 04:52:04 +0000 (20:52 -0800)
committerSuprabh Shukla <suprabh@google.com>
Tue, 31 Jan 2017 04:52:07 +0000 (20:52 -0800)
commit835c8b3d697951ec69fe60ddc19c6f7854213e9e
treea7980a14b8b76f239ca787cadca2aad92c965dee
parent63a27d773b201fc56fdf2b13934ff499c391ca5f
DO NOT MERGE Do not call RecoverySystem with DPMS lock held

Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.

Bug 30681079

Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java