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

am 6abf7c8f: Merge change Iad66a274 into eclair

Browse Source 
Merge commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-mr2

* commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b':
  Fix race condition in WindowManagerService.disableKeyguard()
This commit is contained in:
Mike Lockwood
2009-10-12 11:21:28 -07:00
committed by Android Git Automerger
parent 77df9d6e0c 6abf7c8fcc
commit 5ad4097198
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3971,8 +3971,10 @@ 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");
} }
synchronized (mKeyguardDisabled) {
mKeyguardDisabled.acquire(token, tag); mKeyguardDisabled.acquire(token, tag);
} }
}
public void reenableKeyguard(IBinder token) { public void reenableKeyguard(IBinder token) {
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD) if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD)