Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

frameworks-native: Commit

frameworks/native


Commit MetaInfo

Revisionf09ee697b6319725243b7cd97ce732775066a1ff (tree)
Time2020-02-11 11:33:13
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android 9.0.0 Release 53 (6107734)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXji5AgAKCRDorT+BmrEO
eKSlAJsEGymWYueq13qtV5XOIKeb0hwUNACfTQh3VV2fMXiOQIWXd4Qm/76E+VI=
=LxJs
-----END PGP SIGNATURE-----

Merge tag 'android-9.0.0_r53' into pie-x86

Android 9.0.0 Release 53 (6107734)

Change Summary

Incremental Difference

--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2713,11 +2713,13 @@ status_t Parcel::continueWrite(size_t desired)
27132713 if (objectsSize == 0) {
27142714 free(mObjects);
27152715 mObjects = nullptr;
2716+ mObjectsCapacity = 0;
27162717 } else {
27172718 binder_size_t* objects =
27182719 (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));
27192720 if (objects) {
27202721 mObjects = objects;
2722+ mObjectsCapacity = objectsSize;
27212723 }
27222724 }
27232725 mObjectsSize = objectsSize;
--- a/services/inputflinger/InputDispatcher.cpp
+++ b/services/inputflinger/InputDispatcher.cpp
@@ -105,36 +105,6 @@ static inline const char* toString(bool value) {
105105 return value ? "true" : "false";
106106 }
107107
108-static std::string motionActionToString(int32_t action) {
109- // Convert MotionEvent action to string
110- switch(action & AMOTION_EVENT_ACTION_MASK) {
111- case AMOTION_EVENT_ACTION_DOWN:
112- return "DOWN";
113- case AMOTION_EVENT_ACTION_MOVE:
114- return "MOVE";
115- case AMOTION_EVENT_ACTION_UP:
116- return "UP";
117- case AMOTION_EVENT_ACTION_POINTER_DOWN:
118- return "POINTER_DOWN";
119- case AMOTION_EVENT_ACTION_POINTER_UP:
120- return "POINTER_UP";
121- }
122- return StringPrintf("%" PRId32, action);
123-}
124-
125-static std::string keyActionToString(int32_t action) {
126- // Convert KeyEvent action to string
127- switch(action) {
128- case AKEY_EVENT_ACTION_DOWN:
129- return "DOWN";
130- case AKEY_EVENT_ACTION_UP:
131- return "UP";
132- case AKEY_EVENT_ACTION_MULTIPLE:
133- return "MULTIPLE";
134- }
135- return StringPrintf("%" PRId32, action);
136-}
137-
138108 static inline int32_t getMotionEventActionPointerIndex(int32_t action) {
139109 return (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK)
140110 >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
@@ -4006,11 +3976,7 @@ InputDispatcher::KeyEntry::~KeyEntry() {
40063976 }
40073977
40083978 void InputDispatcher::KeyEntry::appendDescription(std::string& msg) const {
4009- msg += StringPrintf("KeyEvent(deviceId=%d, source=0x%08x, action=%s, "
4010- "flags=0x%08x, keyCode=%d, scanCode=%d, metaState=0x%08x, "
4011- "repeatCount=%d), policyFlags=0x%08x",
4012- deviceId, source, keyActionToString(action).c_str(), flags, keyCode,
4013- scanCode, metaState, repeatCount, policyFlags);
3979+ msg += StringPrintf("KeyEvent");
40143980 }
40153981
40163982 void InputDispatcher::KeyEntry::recycle() {
@@ -4051,19 +4017,7 @@ InputDispatcher::MotionEntry::~MotionEntry() {
40514017 }
40524018
40534019 void InputDispatcher::MotionEntry::appendDescription(std::string& msg) const {
4054- msg += StringPrintf("MotionEvent(deviceId=%d, source=0x%08x, action=%s, actionButton=0x%08x, "
4055- "flags=0x%08x, metaState=0x%08x, buttonState=0x%08x, "
4056- "edgeFlags=0x%08x, xPrecision=%.1f, yPrecision=%.1f, displayId=%d, pointers=[",
4057- deviceId, source, motionActionToString(action).c_str(), actionButton, flags, metaState,
4058- buttonState, edgeFlags, xPrecision, yPrecision, displayId);
4059- for (uint32_t i = 0; i < pointerCount; i++) {
4060- if (i) {
4061- msg += ", ";
4062- }
4063- msg += StringPrintf("%d: (%.1f, %.1f)", pointerProperties[i].id,
4064- pointerCoords[i].getX(), pointerCoords[i].getY());
4065- }
4066- msg += StringPrintf("]), policyFlags=0x%08x", policyFlags);
4020+ msg += StringPrintf("MotionEvent");
40674021 }
40684022
40694023
Show on old repository browser