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

Commit df028a7d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "The order of paramenters is wrong." into main

parents 684639af 05151478

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

+3 −3
Original line number Diff line number Diff line
@@ -896,8 +896,8 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 


    @Override

    public void grantInputChannel(int displayId, SurfaceControl surface,

            IBinder clientToken, IBinder hostInputToken, int flags, int privateFlags, int type,

            int inputFeatures, IBinder windowToken, IBinder inputTransferToken,

            IBinder clientToken, IBinder hostInputToken, int flags, int privateFlags,

            int inputFeatures, int type, IBinder windowToken, IBinder inputTransferToken,

            String inputHandleName, InputChannel outInputChannel) {

        if (hostInputToken == null && !mCanAddInternalSystemWindow) {

            // Callers without INTERNAL_SYSTEM_WINDOW permission cannot grant input channel to
@@ -909,7 +909,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 
        try {

            mService.grantInputChannel(this, mUid, mPid, displayId, surface, clientToken,

                    hostInputToken, flags, mCanAddInternalSystemWindow ? privateFlags : 0,

                    type, inputFeatures, windowToken, inputTransferToken, inputHandleName,

                    inputFeatures, type, windowToken, inputTransferToken, inputHandleName,

                    outInputChannel);

        } finally {

            Binder.restoreCallingIdentity(identity);