diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-18 06:24:43 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-18 06:24:43 +0000 |
commit | 140a593d352c066d1439f9e2fafe22fae9391711 (patch) | |
tree | cbae562b6e875cf3d447e5f0763b34ea07b1a292 | |
parent | 57c282fa3b440b53e0a7bc88d84fcc6b7c828065 (diff) | |
parent | a5cb1c92d576608dbab252c51affab3e77f6e8fa (diff) | |
download | native-android-10.0.0_r28.tar.gz |
Merge cherrypicks of [9944477, 9943994, 9944758, 9942366, 9942368, 9942369, 9942370, 9944687, 9944688, 9944778, 9943870, 9944765, 9944482, 9944412, 9944798, 9944799, 9944800] into qt-qpr1-c-releaseandroid-10.0.0_r28android10-qpr1-c-release
Change-Id: I5d6eb398c4bb45c47b09bc18f9620c64087a25ea
-rw-r--r-- | libs/binder/Parcel.cpp | 2 | ||||
-rw-r--r-- | services/inputflinger/InputDispatcher.cpp | 52 |
2 files changed, 4 insertions, 50 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index afa3d33349..5ad30271d7 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -2839,11 +2839,13 @@ status_t Parcel::continueWrite(size_t desired) if (objectsSize == 0) { free(mObjects); mObjects = nullptr; + mObjectsCapacity = 0; } else { binder_size_t* objects = (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t)); if (objects) { mObjects = objects; + mObjectsCapacity = objectsSize; } } mObjectsSize = objectsSize; diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index c2ff4c9629..b921d954dc 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -109,36 +109,6 @@ static inline const char* toString(bool value) { return value ? "true" : "false"; } -static std::string motionActionToString(int32_t action) { - // Convert MotionEvent action to string - switch(action & AMOTION_EVENT_ACTION_MASK) { - case AMOTION_EVENT_ACTION_DOWN: - return "DOWN"; - case AMOTION_EVENT_ACTION_MOVE: - return "MOVE"; - case AMOTION_EVENT_ACTION_UP: - return "UP"; - case AMOTION_EVENT_ACTION_POINTER_DOWN: - return "POINTER_DOWN"; - case AMOTION_EVENT_ACTION_POINTER_UP: - return "POINTER_UP"; - } - return StringPrintf("%" PRId32, action); -} - -static std::string keyActionToString(int32_t action) { - // Convert KeyEvent action to string - switch (action) { - case AKEY_EVENT_ACTION_DOWN: - return "DOWN"; - case AKEY_EVENT_ACTION_UP: - return "UP"; - case AKEY_EVENT_ACTION_MULTIPLE: - return "MULTIPLE"; - } - return StringPrintf("%" PRId32, action); -} - static std::string dispatchModeToString(int32_t dispatchMode) { switch (dispatchMode) { case InputTarget::FLAG_DISPATCH_AS_IS: @@ -4614,11 +4584,7 @@ InputDispatcher::KeyEntry::~KeyEntry() { } void InputDispatcher::KeyEntry::appendDescription(std::string& msg) const { - msg += StringPrintf("KeyEvent(deviceId=%d, source=0x%08x, displayId=%" PRId32 ", action=%s, " - "flags=0x%08x, keyCode=%d, scanCode=%d, metaState=0x%08x, " - "repeatCount=%d), policyFlags=0x%08x", - deviceId, source, displayId, keyActionToString(action).c_str(), flags, keyCode, - scanCode, metaState, repeatCount, policyFlags); + msg += StringPrintf("KeyEvent"); } void InputDispatcher::KeyEntry::recycle() { @@ -4661,21 +4627,7 @@ InputDispatcher::MotionEntry::~MotionEntry() { } void InputDispatcher::MotionEntry::appendDescription(std::string& msg) const { - msg += StringPrintf("MotionEvent(deviceId=%d, source=0x%08x, displayId=%" PRId32 - ", action=%s, actionButton=0x%08x, flags=0x%08x, metaState=0x%08x, buttonState=0x%08x, " - "classification=%s, edgeFlags=0x%08x, xPrecision=%.1f, yPrecision=%.1f, pointers=[", - deviceId, source, displayId, motionActionToString(action).c_str(), actionButton, flags, - metaState, buttonState, motionClassificationToString(classification), edgeFlags, - xPrecision, yPrecision); - - for (uint32_t i = 0; i < pointerCount; i++) { - if (i) { - msg += ", "; - } - msg += StringPrintf("%d: (%.1f, %.1f)", pointerProperties[i].id, - pointerCoords[i].getX(), pointerCoords[i].getY()); - } - msg += StringPrintf("]), policyFlags=0x%08x", policyFlags); + msg += StringPrintf("MotionEvent"); } |