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

Commit cfab5d67 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use cached pid uid from Session"

parents 2b52677b 0e7536c1

services/core/java/com/android/server/wm/Session.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -263,11 +263,9 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 
    @Override

    @Override

    public IBinder performDrag(IWindow window, int flags, SurfaceControl surface, int touchSource,

    public IBinder performDrag(IWindow window, int flags, SurfaceControl surface, int touchSource,

            float touchX, float touchY, float thumbCenterX, float thumbCenterY, ClipData data) {

            float touchX, float touchY, float thumbCenterX, float thumbCenterY, ClipData data) {

        final int callerPid = Binder.getCallingPid();

        final int callerUid = Binder.getCallingUid();

        final long ident = Binder.clearCallingIdentity();

        final long ident = Binder.clearCallingIdentity();

        try {

        try {

            return mDragDropController.performDrag(mSurfaceSession, callerPid, callerUid, window,

            return mDragDropController.performDrag(mSurfaceSession, mPid, mUid, window,

                    flags, surface, touchSource, touchX, touchY, thumbCenterX, thumbCenterY, data);

                    flags, surface, touchSource, touchX, touchY, thumbCenterX, thumbCenterY, data);

        } finally {

        } finally {

            Binder.restoreCallingIdentity(ident);

            Binder.restoreCallingIdentity(ident);
@@ -625,11 +623,9 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 




    public void grantInputChannel(int displayId, SurfaceControl surface,

    public void grantInputChannel(int displayId, SurfaceControl surface,

            IWindow window, IBinder hostInputToken, InputChannel outInputChannel) {

            IWindow window, IBinder hostInputToken, InputChannel outInputChannel) {

        final int callerUid = Binder.getCallingUid();

        final int callerPid = Binder.getCallingPid();

        final long identity = Binder.clearCallingIdentity();

        final long identity = Binder.clearCallingIdentity();

        try {

        try {

            mService.grantInputChannel(callerUid, callerPid, displayId, surface, window,

            mService.grantInputChannel(mUid, mPid, displayId, surface, window,

                    hostInputToken, outInputChannel);

                    hostInputToken, outInputChannel);

        } finally {

        } finally {

            Binder.restoreCallingIdentity(identity);

            Binder.restoreCallingIdentity(identity);