diff options
| author | 2018-12-13 16:38:22 +0000 | |
|---|---|---|
| committer | 2018-12-13 16:38:22 +0000 | |
| commit | 55ef412bc920b7e73e8be37665dc2f84f152288c (patch) | |
| tree | 06d316e9350fc01ac4eaec17792d12fa25bfa5ca /libs/gui | |
| parent | d7cec95b39982ca3e6a66555901821a88a2dfc91 (diff) | |
| parent | 1d4c6a66c209ed69ab374e28d8bab34809edb9de (diff) | |
Merge changes Ie8fe724d,Ifd42f31d
* changes:
SF: clean up casting around histogram reporting
binder: add read/writeUint64Vector functions
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/ISurfaceComposer.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp index bd943c120e..2d6be26903 100644 --- a/libs/gui/ISurfaceComposer.cpp +++ b/libs/gui/ISurfaceComposer.cpp @@ -675,23 +675,19 @@ public: return result; } - result = reply.readInt64Vector( - reinterpret_cast<std::vector<int64_t>*>(&outStats->component_0_sample)); + result = reply.readUint64Vector(&outStats->component_0_sample); if (result != NO_ERROR) { return result; } - result = reply.readInt64Vector( - reinterpret_cast<std::vector<int64_t>*>(&outStats->component_1_sample)); + result = reply.readUint64Vector(&outStats->component_1_sample); if (result != NO_ERROR) { return result; } - result = reply.readInt64Vector( - reinterpret_cast<std::vector<int64_t>*>(&outStats->component_2_sample)); + result = reply.readUint64Vector(&outStats->component_2_sample); if (result != NO_ERROR) { return result; } - result = reply.readInt64Vector( - reinterpret_cast<std::vector<int64_t>*>(&outStats->component_3_sample)); + result = reply.readUint64Vector(&outStats->component_3_sample); return result; } }; @@ -1121,14 +1117,10 @@ status_t BnSurfaceComposer::onTransact( result = getDisplayedContentSample(display, maxFrames, timestamp, &stats); if (result == NO_ERROR) { reply->writeUint64(stats.numFrames); - reply->writeInt64Vector( - *reinterpret_cast<std::vector<int64_t>*>(&stats.component_0_sample)); - reply->writeInt64Vector( - *reinterpret_cast<std::vector<int64_t>*>(&stats.component_1_sample)); - reply->writeInt64Vector( - *reinterpret_cast<std::vector<int64_t>*>(&stats.component_2_sample)); - reply->writeInt64Vector( - *reinterpret_cast<std::vector<int64_t>*>(&stats.component_3_sample)); + reply->writeUint64Vector(stats.component_0_sample); + reply->writeUint64Vector(stats.component_1_sample); + reply->writeUint64Vector(stats.component_2_sample); + reply->writeUint64Vector(stats.component_3_sample); } return result; } |