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

Commit 39bc6117 authored by Chris Ye's avatar Chris Ye Committed by Winson Chung
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
Bug: 196389741
Test: atest WindowManagerServiceTests
Change-Id: I58cf9f38c496e0ae8b2193dca45c0805e831bc9e
Merged-In: I58cf9f38c496e0ae8b2193dca45c0805e831bc9e
parent 62eaabc3

include/input/InputWindow.h

+8 −8
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ struct InputWindowInfo { 
        TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW + 32,

        TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW + 34,

        TYPE_NOTIFICATION_SHADE = FIRST_SYSTEM_WINDOW + 40,

        TYPE_TRUSTED_APPLICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 42,

        LAST_SYSTEM_WINDOW = 2999,

    };
@@ -163,6 +162,12 @@ struct InputWindowInfo { 
    bool hasFocus = false;

    bool hasWallpaper = false;

    bool paused = false;

    /* This flag is set when the window is of a trusted type that is allowed to silently

     * overlay other windows for the purpose of implementing the secure views feature.

     * Trusted overlays, such as IME windows, can partly obscure other windows without causing

     * motion events to be delivered to them with AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED.

     */

    bool trustedOverlay = false;

    int32_t ownerPid = -1;

    int32_t ownerUid = -1;

    int32_t inputFeatures = 0;
@@ -175,20 +180,15 @@ struct InputWindowInfo { 
    void addTouchableRegion(const Rect& region);



    bool touchableRegionContainsPoint(int32_t x, int32_t y) const;

    bool frameContainsPoint(int32_t x, int32_t y) const;



    /* Returns true if the window is of a trusted type that is allowed to silently

     * overlay other windows for the purpose of implementing the secure views feature.

     * Trusted overlays, such as IME windows, can partly obscure other windows without causing

     * motion events to be delivered to them with AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED.

     */

    bool isTrustedOverlay() const;

    bool frameContainsPoint(int32_t x, int32_t y) const;



    bool supportsSplitTouch() const;



    bool overlaps(const InputWindowInfo* other) const;



    status_t write(Parcel& output) const;



    static InputWindowInfo read(const Parcel& from);

};

libs/input/InputWindow.cpp

+2 −14
Original line number Diff line number Diff line
@@ -42,20 +42,6 @@ bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const { 
            && y >= frameTop && y < frameBottom;

}



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

bool InputWindowInfo::isTrustedOverlay() const {

    return layoutParamsType == TYPE_INPUT_METHOD || layoutParamsType == TYPE_INPUT_METHOD_DIALOG ||

            layoutParamsType == TYPE_MAGNIFICATION_OVERLAY || layoutParamsType == TYPE_STATUS_BAR ||

            layoutParamsType == TYPE_NOTIFICATION_SHADE ||

            layoutParamsType == TYPE_NAVIGATION_BAR ||

            layoutParamsType == TYPE_NAVIGATION_BAR_PANEL ||

            layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY ||

            layoutParamsType == TYPE_DOCK_DIVIDER ||

            layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY ||

            layoutParamsType == TYPE_INPUT_CONSUMER ||

            layoutParamsType == TYPE_TRUSTED_APPLICATION_OVERLAY;

}



bool InputWindowInfo::supportsSplitTouch() const {

    return layoutParamsFlags & FLAG_SPLIT_TOUCH;

}
@@ -92,6 +78,7 @@ status_t InputWindowInfo::write(Parcel& output) const { 
    output.writeBool(hasFocus);

    output.writeBool(hasWallpaper);

    output.writeBool(paused);

    output.writeBool(trustedOverlay);

    output.writeInt32(ownerPid);

    output.writeInt32(ownerUid);

    output.writeInt32(inputFeatures);
@@ -130,6 +117,7 @@ InputWindowInfo InputWindowInfo::read(const Parcel& from) { 
    ret.hasFocus = from.readBool();

    ret.hasWallpaper = from.readBool();

    ret.paused = from.readBool();

    ret.trustedOverlay = from.readBool();

    ret.ownerPid = from.readInt32();

    ret.ownerUid = from.readInt32();

    ret.inputFeatures = from.readInt32();

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2092,7 +2092,7 @@ static bool canBeObscuredBy(const sp<InputWindowHandle>& windowHandle, 
        // If ownerPid is the same we don't generate occlusion events as there

        // is no in-process security boundary.

        return false;

    } else if (otherInfo->isTrustedOverlay()) {

    } else if (otherInfo->trustedOverlay) {

        return false;

    } else if (otherInfo->displayId != info->displayId) {

        return false;