OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
650536f
)
Sensor: use FlattenableUtils::align
author
Steven Moreland
<smoreland@google.com>
Tue, 8 Oct 2019 00:30:23 +0000
(17:30 -0700)
committer
Kyriakos Ispoglou
<ispo@google.com>
Fri, 8 Nov 2019 00:19:37 +0000
(16:19 -0800)
Since it memsets skipped over memory now.
Bug:
141890807
Test: boot, check buffer is zero'd here
Change-Id: Ieb3cd90215a3ccc1dc43365ecde251a50db08553
(cherry picked from commit
d58cf5acb863eddbbeb9982439965e259045940e
)
(cherry picked from commit
dbd0eecfc7570231d5cbb76678b0358c43ee6d3c
)
libs/sensor/Sensor.cpp
patch
|
blob
|
history
diff --git
a/libs/sensor/Sensor.cpp
b/libs/sensor/Sensor.cpp
index
a0e368c
..
2383516
100644
(file)
--- a/
libs/sensor/Sensor.cpp
+++ b/
libs/sensor/Sensor.cpp
@@
-562,7
+562,8
@@
void Sensor::flattenString8(void*& buffer, size_t& size,
uint32_t len = static_cast<uint32_t>(string8.length());
FlattenableUtils::write(buffer, size, len);
memcpy(static_cast<char*>(buffer), string8.string(), len);
- FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
+ FlattenableUtils::advance(buffer, size, len);
+ size -= FlattenableUtils::align<4>(buffer);
}
bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& outputString8) {