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

Merge "fix a weird use of Vector::appendVector()"

Browse Source
This commit is contained in:
Mathias Agopian
2011-07-11 18:30:41 -07:00
committed by Android (Google) Code Review
parent e92963c3f9 198fd888ad
commit e230189444
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/input/InputDispatcher.cpp
View File

@@ -3154,11 +3154,9 @@ void InputDispatcher::setInputWindows(const Vector<InputWindow>& inputWindows) {
mLastHoverWindow = NULL;
}
mWindows.clear();
// Loop over new windows and rebuild the necessary window pointers for
// tracking focus and touch.
mWindows.appendVector(inputWindows);
mWindows = inputWindows;
size_t numWindows = mWindows.size();
for (size_t i = 0; i < numWindows; i++) {
@@ -4560,8 +4558,7 @@ void InputDispatcher::TouchState::copyFrom(const TouchState& other) {
split = other.split;
deviceId = other.deviceId;
source = other.source;
windows.clear();
windows.appendVector(other.windows);
windows = other.windows;
}
void InputDispatcher::TouchState::addOrUpdateWindow(const InputWindow* window,