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

Commit d0ad4beb authored by Robert Carr's avatar Robert Carr Committed by Rob Carr
Browse files

DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. 

NO_INPUT_CHANNEL is a hidden WM flag that allows creation of a window
without an input channel. Unfortunately in releases prior to Android R
this would allow creation of a Window which will not be known to the
InputDispatcher at all. This means that the logic generating
FLAG_OBSCURED will work and a window will be able to overlay another
window without the overlayed window being notified. In Android R and
later this isn't a problem as the InputDispatcher is informed of all
windows, input channel or not. For past Android releases, this patch
disables NO_INPUT_CHANNEL for use outside of the WM.

Bug: 152064592
Test: Existing tests pass
Change-Id: I7e1f45cba139eab92e7df88d1e052baba0ae2cc6
parent e8630b7a

core/java/android/view/InputChannel.java

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ public final class InputChannel implements Parcelable { 
        return name != null ? name : "uninitialized";

    }



    /**

     * @hide

     */

    public boolean isValid() {

        return mPtr != 0;

    }



    /**

     * Disposes the input channel.

     * Explicitly releases the reference this object is holding on the input channel.

core/java/android/view/ViewRootImpl.java

+2 −5
Original line number Diff line number Diff line
@@ -875,10 +875,7 @@ public final class ViewRootImpl implements ViewParent, 
                // manager, to make sure we do the relayout before receiving

                // any other events from the system.

                requestLayout();

                if ((mWindowAttributes.inputFeatures

                        & WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL) == 0) {

		mInputChannel = new InputChannel();

                }

                mForceDecorViewVisibility = (mWindowAttributes.privateFlags

                        & PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY) != 0;

                try {
@@ -971,7 +968,7 @@ public final class ViewRootImpl implements ViewParent, 
                    mInputQueueCallback =

                        ((RootViewSurfaceTaker)view).willYouTakeTheInputQueue();

                }

                if (mInputChannel != null) {

                if (mInputChannel.isValid()) {

                    if (mInputQueueCallback != null) {

                        mInputQueue = new InputQueue();

                        mInputQueueCallback.onInputQueueCreated(mInputQueue);

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

+7 −2
Original line number Diff line number Diff line
@@ -1462,8 +1462,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                return res;

            }



            final boolean openInputChannels = (outInputChannel != null

            boolean openInputChannels = (outInputChannel != null

                && (attrs.inputFeatures & INPUT_FEATURE_NO_INPUT_CHANNEL) == 0);

            if (callingUid != SYSTEM_UID) {

                Slog.e(TAG_WM,

                    "App trying to use insecure INPUT_FEATURE_NO_INPUT_CHANNEL flag. Ignoring");

                openInputChannels = true;

            }

            if  (openInputChannels) {

                win.openInputChannel(outInputChannel);

            }