Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5ad40971: am 6abf7c8f: Merge change Iad66a274 into eclair

Browse Source 
Merge commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea' into eclair-mr2-plus-aosp

* commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea':
  Fix race condition in WindowManagerService.disableKeyguard()
This commit is contained in:
Mike Lockwood
2009-10-12 11:26:58 -07:00
committed by Android Git Automerger
parent 132570cbf4 5ad4097198
commit a7cdac0329
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/WindowManagerService.java
View File

@@ -3971,7 +3971,9 @@ public class WindowManagerService extends IWindowManager.Stub
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Requires DISABLE_KEYGUARD permission"); throw new SecurityException("Requires DISABLE_KEYGUARD permission");
} }
mKeyguardDisabled.acquire(token, tag); synchronized (mKeyguardDisabled) {
mKeyguardDisabled.acquire(token, tag);
}
} }
public void reenableKeyguard(IBinder token) { public void reenableKeyguard(IBinder token) {