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

Commit e6153ee3 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am 63b57ef1: am c1940167: Merge "Use the original caller pid for computing... 

am 63b57ef1: am c1940167: Merge "Use the original caller pid for computing visibility" into jb-mr1-dev

* commit '63b57ef1':
  Use the original caller pid for computing visibility
parents 8444b247 63b57ef1

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -5651,12 +5651,12 @@ public class WindowManagerService extends IWindowManager.Stub 
    @Override

    @Override

    public void showStrictModeViolation(boolean on) {

    public void showStrictModeViolation(boolean on) {

        if (mHeadless) return;

        if (mHeadless) return;

        mH.sendMessage(mH.obtainMessage(H.SHOW_STRICT_MODE_VIOLATION, on ? 1 : 0, 0));

        int pid = Binder.getCallingPid();

        mH.sendMessage(mH.obtainMessage(H.SHOW_STRICT_MODE_VIOLATION, on ? 1 : 0, pid));

    }

    }





    private void showStrictModeViolation(int arg) {

    private void showStrictModeViolation(int arg, int pid) {

        final boolean on = arg != 0;

        final boolean on = arg != 0;

        int pid = Binder.getCallingPid();

        synchronized(mWindowMap) {

        synchronized(mWindowMap) {

            // Ignoring requests to enable the red border from clients

            // Ignoring requests to enable the red border from clients

            // which aren't on screen.  (e.g. Broadcast Receivers in

            // which aren't on screen.  (e.g. Broadcast Receivers in
@@ -7647,7 +7647,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                }





                case SHOW_STRICT_MODE_VIOLATION: {

                case SHOW_STRICT_MODE_VIOLATION: {

                    showStrictModeViolation(msg.arg1);

                    showStrictModeViolation(msg.arg1, msg.arg2);

                    break;

                    break;

                }

                }