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

Commit 05151478 authored by Kai Peng's avatar Kai Peng Committed by Garfield Tan
Browse files

The order of paramenters is wrong. 

The order of paramenters inputFeatures and type does not correspond to what is written in the IWindowSession.

Bug: 266866903
Test: Presubmit tests
Change-Id: I4304d1e69ac4c5bef1fad23cf696a297c1d96e29
Merged-In: Ice85622a16a4d3074cac9c5ae556cc33c276d0af
parent 412cb16d

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);