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

Commit 679475ec authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "[1/n] Include input feature flags in KeyInterceptionInfo" into main

parents cd235cf0 b80293cd

core/java/com/android/internal/policy/KeyInterceptionInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -24,13 +24,15 @@ public class KeyInterceptionInfo { 
    // Window layout params attributes.

    public final int layoutParamsType;

    public final int layoutParamsPrivateFlags;

    public final int layoutParamsInputFeatures;

    // Debug friendly name to help identify the window

    public final String windowTitle;

    public final int windowOwnerUid;



    public KeyInterceptionInfo(int type, int flags, String title, int uid) {

    public KeyInterceptionInfo(int type, int flags, int inputFeatures, String title, int uid) {

        layoutParamsType = type;

        layoutParamsPrivateFlags = flags;

        layoutParamsInputFeatures = inputFeatures;

        windowTitle = title;

        windowOwnerUid = uid;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -5549,7 +5549,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                || mKeyInterceptionInfo.windowTitle != getWindowTag()

                || mKeyInterceptionInfo.windowOwnerUid != getOwningUid()) {

            mKeyInterceptionInfo = new KeyInterceptionInfo(mAttrs.type, mAttrs.privateFlags,

                    getWindowTag().toString(), getOwningUid());

                    mAttrs.inputFeatures, getWindowTag().toString(), getOwningUid());

        }

        return mKeyInterceptionInfo;

    }

services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ class TestPhoneWindowManager { 
        doNothing().when(mContext).startActivityAsUser(any(), any());

        doNothing().when(mContext).startActivityAsUser(any(), any(), any());



        KeyInterceptionInfo interceptionInfo = new KeyInterceptionInfo(0, 0, null, 0);

        KeyInterceptionInfo interceptionInfo = new KeyInterceptionInfo(0, 0, 0, null, 0);

        doReturn(interceptionInfo)

                .when(mWindowManagerInternal).getKeyInterceptionInfoFromToken(any());

tests/Input/src/com/android/server/input/InputManagerServiceTests.kt

+1 −0
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ class InputManagerServiceTests { 
            } else {

                0

            },

            /* inputFeatures = */0,

            "title",

            /* uid = */0

        )