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

Commit 535a128d authored by Chris Ye's avatar Chris Ye
Browse files

Change InputWindowInfo::isTrustedOverlay() to be permission and flag based 

Add private flag to WindowManager.LayoutParams. If the flag is set,
check if caller has INTERNAL_SYSTEM_WINDOW permission.

Bug: 155781676
Test: atest WindowManagerServiceTests
Change-Id: I70151697cc01e8427129f951f0ebadc4805b2d56
parent 1eee66b8

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4984,7 +4984,7 @@ package android.view { 
    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000

    field public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 64; // 0x40

    field public CharSequence accessibilityTitle;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION"), @android.view.ViewDebug.FlagToString(mask=0x1000000, equals=0x1000000, name="COLOR_SPACE_AGNOSTIC"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="APPEARANCE_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="BEHAVIOR_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x10000000, equals=0x10000000, name="FIT_INSETS_CONTROLLED")}) public int privateFlags;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION"), @android.view.ViewDebug.FlagToString(mask=0x1000000, equals=0x1000000, name="COLOR_SPACE_AGNOSTIC"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="APPEARANCE_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="BEHAVIOR_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x10000000, equals=0x10000000, name="FIT_INSETS_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x20000000, equals=0x20000000, name="TRUSTED_OVERLAY")}) public int privateFlags;

  }



}

core/java/android/view/IWindowSession.aidl

+3 −2
Original line number Diff line number Diff line
@@ -336,11 +336,12 @@ interface IWindowSession { 
    * an input channel where the client can receive input.

    */

    void grantInputChannel(int displayId, in SurfaceControl surface, in IWindow window,

            in IBinder hostInputToken, int flags, int type, out InputChannel outInputChannel);

            in IBinder hostInputToken, int flags, int privateFlags, int type,

            out InputChannel outInputChannel);



    /**

     * Update the flags on an input channel associated with a particular surface.

     */

    void updateInputChannel(in IBinder channelToken, int displayId, in SurfaceControl surface,

            int flags, in Region region);

            int flags, int privateFlags, in Region region);

}

core/java/android/view/InputWindowHandle.java

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ public final class InputWindowHandle { 
    // Input event dispatching is paused.

    public boolean paused;



    // Window is trusted overlay.

    public boolean trustedOverlay;



    // Id of process and user that owns the window.

    public int ownerPid;

    public int ownerUid;

core/java/android/view/WindowManager.java

+24 −9
Original line number Diff line number Diff line
@@ -1214,14 +1214,6 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_STATUS_BAR_ADDITIONAL = FIRST_SYSTEM_WINDOW + 41;



        /**

         * Similar to TYPE_APPLICATION_OVERLAY, but trusted to overlay other windows since it is

         * is coming from the system.

         * @hide

         */

        // TODO(b/155781676): Remove and replace call points with trustedOverlay when that is ready.

        public static final int TYPE_TRUSTED_APPLICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 42;



        /**

         * End of types of system windows.

         */
@@ -2019,6 +2011,11 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int PRIVATE_FLAG_FIT_INSETS_CONTROLLED = 0x10000000;



        /**

         * Flag to indicate that the window is a trusted overlay.

         * @hide

         */

        public static final int PRIVATE_FLAG_TRUSTED_OVERLAY = 0x20000000;

        /**

         * An internal annotation for flags that can be specified to {@link #softInputMode}.

         *
@@ -2129,7 +2126,11 @@ public interface WindowManager extends ViewManager { 
                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_FIT_INSETS_CONTROLLED,

                        equals = PRIVATE_FLAG_FIT_INSETS_CONTROLLED,

                        name = "FIT_INSETS_CONTROLLED")

                        name = "FIT_INSETS_CONTROLLED"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_TRUSTED_OVERLAY,

                        equals = PRIVATE_FLAG_TRUSTED_OVERLAY,

                        name = "TRUSTED_OVERLAY")

        })

        @TestApi

        public int privateFlags;
@@ -2928,6 +2929,20 @@ public interface WindowManager extends ViewManager { 
            privateFlags |= PRIVATE_FLAG_FIT_INSETS_CONTROLLED;

        }



        /**

         * Specifies that the window should be considered a trusted system overlay. Trusted system

         * overlays are ignored when considering whether windows are obscured during input

         * dispatch. Requires the {@link android.Manifest.permission.INTERNAL_SYSTEM_WINDOW}

         * permission.

         *

         * {@see android.view.MotionEvent#FLAG_WINDOW_IS_OBSCURED}

         * {@see android.view.MotionEvent#FLAG_WINDOW_IS_PARTIALLY_OBSCURED}

         * @hide

         */

        public void setTrustedOverlay() {

            privateFlags |= PRIVATE_FLAG_TRUSTED_OVERLAY;

        }



        /**

         * @return the insets types that this window is avoiding overlapping.

         */

core/java/android/view/WindowlessWindowManager.java

+7 −5
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ public class WindowlessWindowManager implements IWindowSession { 
            if (state.mInputChannelToken != null) {

                try {

                    mRealWm.updateInputChannel(state.mInputChannelToken, state.mDisplayId,

                            state.mSurfaceControl, state.mParams.flags, state.mInputRegion);

                            state.mSurfaceControl, state.mParams.flags, state.mParams.privateFlags,

                            state.mInputRegion);

                } catch (RemoteException e) {

                    Log.e(TAG, "Failed to update surface input channel: ", e);

                }
@@ -143,7 +144,7 @@ public class WindowlessWindowManager implements IWindowSession { 
                WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL) == 0)) {

            try {

                mRealWm.grantInputChannel(displayId, sc, window, mHostInputToken, attrs.flags,

                        attrs.type, outInputChannel);

                        attrs.privateFlags, attrs.type, outInputChannel);

            } catch (RemoteException e) {

                Log.e(TAG, "Failed to grant input to surface: ", e);

            }
@@ -262,7 +263,7 @@ public class WindowlessWindowManager implements IWindowSession { 
                && state.mInputChannelToken != null) {

            try {

                mRealWm.updateInputChannel(state.mInputChannelToken, state.mDisplayId, sc,

                        attrs.flags, state.mInputRegion);

                        attrs.flags, attrs.privateFlags, state.mInputRegion);

            } catch (RemoteException e) {

                Log.e(TAG, "Failed to update surface input channel: ", e);

            }
@@ -432,12 +433,13 @@ public class WindowlessWindowManager implements IWindowSession { 


    @Override

    public void grantInputChannel(int displayId, SurfaceControl surface, IWindow window,

            IBinder hostInputToken, int flags, int type, InputChannel outInputChannel) {

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

            InputChannel outInputChannel) {

    }



    @Override

    public void updateInputChannel(IBinder channelToken, int displayId, SurfaceControl surface,

            int flags, Region region) {

            int flags, int privateFlags, Region region) {

    }



    @Override