summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Gardner <byron.gardner@intel.com>2014-11-03 15:54:28 -0800
committerChih-Wei Huang <cwhuang@linux.org.tw>2016-05-06 01:55:12 +0800
commit806072c029d5b55e8e17e198f6b513bbc59d33c4 (patch)
treebccca120df288175532e0863bdae78d52d759bb5
parent0d8d4a9f34e03a7db875ddce8531259cff52c81b (diff)
downloadframeworks_native-806072c029d5b55e8e17e198f6b513bbc59d33c4.zip
frameworks_native-806072c029d5b55e8e17e198f6b513bbc59d33c4.tar.gz
frameworks_native-806072c029d5b55e8e17e198f6b513bbc59d33c4.tar.bz2
Enable 64-bit support in libs/gui/Sensor.cpp
Change-Id: Iaaa112bd821a6a0e3234461df8f7b6acc47b254e Orig-Change-Id: I04c22e6f2c6f4271ca451b775c8d7f86e4c97c38 Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-9998 Category: aosp improvement Domain: SENSORS.VIRT-Common Origin: internal Upstream-Candidate: yes Signed-off-by: Byron Gardner <byron.gardner@intel.com> Reviewed-on: https://android.intel.com:443/296325
-rw-r--r--libs/gui/Sensor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
index 235cbbd..f0c52a0 100644
--- a/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@ -376,10 +376,10 @@ size_t Sensor::getFlattenedSize() const
sizeof(bool);
size_t variableSize =
- sizeof(uint32_t) + FlattenableUtils::align<4>(mName.length()) +
- sizeof(uint32_t) + FlattenableUtils::align<4>(mVendor.length()) +
- sizeof(uint32_t) + FlattenableUtils::align<4>(mStringType.length()) +
- sizeof(uint32_t) + FlattenableUtils::align<4>(mRequiredPermission.length());
+ sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mName.length()) +
+ sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mVendor.length()) +
+ sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mStringType.length()) +
+ sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mRequiredPermission.length());
return fixedSize + variableSize;
}