From: Byron Gardner <byron.gardner@intel.com>
Date: Mon, 3 Nov 2014 23:54:28 +0000 (-0800)
Subject: Enable 64-bit support in libs/gui/Sensor.cpp
X-Git-Tag: android-x86-8.1-r1~16^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4b84b4b505933f26273dc7fbaeb67f233aa75bc3;p=android-x86%2Fframeworks-native.git

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
---

diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
index a0e368c7e4..8ea97ca280 100644
--- a/libs/sensor/Sensor.cpp
+++ b/libs/sensor/Sensor.cpp
@@ -462,10 +462,10 @@ size_t Sensor::getFlattenedSize() const {
             sizeof(mRequiredAppOp) + sizeof(mMaxDelay) + sizeof(mFlags) + sizeof(mUuid);
 
     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;
 }