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

Commit 58b9ee28 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in... 

am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev

* commit 'cd75f59f':
  Fix deadlock caused by synchronous setOccluded() method in keyguard
parents 58cdb919 cd75f59f

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Binder; 
import android.os.Bundle;

import android.os.Debug;

import android.os.IBinder;

import android.os.Process;

import android.util.Log;

import android.view.MotionEvent;
@@ -52,6 +53,10 @@ public class KeyguardService extends Service { 
    }



    void checkPermission() {

        // Avoid deadlock by avoiding calling back into the system process.

        if (Binder.getCallingUid() == Process.SYSTEM_UID) return;



        // Otherwise,explicitly check for caller permission ...

        if (getBaseContext().checkCallingOrSelfPermission(PERMISSION) != PERMISSION_GRANTED) {

            Log.w(TAG, "Caller needs permission '" + PERMISSION + "' to call " + Debug.getCaller());

            throw new SecurityException("Access denied to process: " + Binder.getCallingPid()