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

Commit ae7bc652 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 0d9288d7: am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945 

* commit '0d9288d7':
  Fix bounds check. Bug: 4413945
parents dce3e2e1 0d9288d7

services/input/InputWindow.cpp

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ bool InputWindow::touchableRegionContainsPoint(int32_t x, int32_t y) const { 
}



bool InputWindow::frameContainsPoint(int32_t x, int32_t y) const {

    return x <= frameRight || y <= frameBottom;

    return x >= frameLeft && x <= frameRight

            && y >= frameTop && y <= frameBottom;

}



bool InputWindow::isTrustedOverlay() const {

services/input/InputWindow.h

+0 −5
Original line number Diff line number Diff line
@@ -147,11 +147,6 @@ struct InputWindow { 
    bool touchableRegionContainsPoint(int32_t x, int32_t y) const;

    bool frameContainsPoint(int32_t x, int32_t y) const;



    /* These use the globalScale to convert a given screen offset to the

     * corresponding location within the window.

     */

    int32_t displayToWindowX(int32_t x) 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