Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ad40971 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 6abf7c8f: Merge change Iad66a274 into eclair 

Merge commit '6abf7c8f' into eclair-mr2

* commit '6abf7c8f':
  Fix race condition in WindowManagerService.disableKeyguard()
parents 77df9d6e 6abf7c8f

services/java/com/android/server/WindowManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -3971,8 +3971,10 @@ public class WindowManagerService extends IWindowManager.Stub 
            != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Requires DISABLE_KEYGUARD permission");

        }

        synchronized (mKeyguardDisabled) {

            mKeyguardDisabled.acquire(token, tag);

        }

    }



    public void reenableKeyguard(IBinder token) {

        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD)