Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bounds check.

Browse Source 
Bug: 4413945

Also remove dead code from header file.

Change-Id: I4e9fc9d7f8612fedb436e62649d308bd737ed138
This commit is contained in:
Jeff Brown
2011-05-13 12:51:12 -07:00
parent 0ed2e845db
commit 4fb76253f2
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/input/InputWindow.cpp
View File

@@ -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 {

5
services/input/InputWindow.h
View File

@@ -145,11 +145,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