From 50016ca463e68f9cd4df821684b62a7018d0870a Mon Sep 17 00:00:00 2001
From: "eddy-sh.chen" <eddy-sh.chen@mstarsemi.com>
Date: Fri, 25 May 2018 16:43:08 +0800
Subject: [PATCH] Do not call finishKeyguardDrawn with PWM's mlock
Otherwise it may cause a deadlock between
PWM's mlock and WMS's mWindowMap.
Just post the work to the policy handler instead.
Bug: 80279029
Change-Id: Idae333687cf5c88e1893ee216c278b9e6c17dd98
---
.../core/java/com/android/server/policy/PhoneWindowManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 0971058bedbd1..521d558a995e0 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6819,7 +6819,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} else {
if (DEBUG_WAKEUP) Slog.d(TAG,
"null mKeyguardDelegate: setting mKeyguardDrawComplete.");
- finishKeyguardDrawn();
+ mHandler.sendEmptyMessage(MSG_KEYGUARD_DRAWN_COMPLETE);
}
}
}
--
GitLab