OSDN Git Service

Merge "Do not call finishKeyguardDrawn with PWM's mlock" am: 1c3681fe7c
authorJorim Jaggi <jjaggi@google.com>
Mon, 28 May 2018 12:53:37 +0000 (05:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 May 2018 12:53:37 +0000 (05:53 -0700)
commita093ca0603d9caf2f2a9ccaa6ad835021746abaa
treefa87fcfaaaf55b547c928c186877be46eb899bd6
parent3a763e30c6dff95b57c1b24d47e7829cc721a6c3
parent34e4c974aa682daa5a36dd6ca542522f7c50e6c2
Merge "Do not call finishKeyguardDrawn with PWM's mlock" am: 1c3681fe7c
am: 34e4c974aa

Change-Id: I9dcc29873ecb7866343fb733ca700f2a5a757853
services/core/java/com/android/server/policy/PhoneWindowManager.java