Commit: d1db1b05644534ace4d44188328ab71981902c0d - system-core (git)

system/core

Commit MetaInfo

• Revisión: d1db1b05644534ace4d44188328ab71981902c0d (tree)
• Tiempo: 2020-03-16 19:40:16
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Android 8.1.0 release 74
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXl1rEQAKCRDorT+BmrEO
eHkBAJ424Rr1MSONEqf80hBgRtrNftMFNACfV1NFp9yrxr6WUtMPMul1pL7UCss=
=dVjT
-----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r74' into oreo-x86

Android 8.1.0 release 74

Cambiar Resumen

• modified: libutils/include/utils/Flattenable.h

Diferencia incremental

--- a/libutils/include/utils/Flattenable.h
+++ b/libutils/include/utils/Flattenable.h
@@ -47,7 +47,12 @@ public:
 
     template<size_t N>
     static size_t align(void*& buffer) {
-        return align<N>( const_cast<void const*&>(buffer) );
+        static_assert(!(N & (N - 1)), "Can only align to a power of 2.");
+        void* b = buffer;
+        buffer = reinterpret_cast<void*>((uintptr_t(buffer) + (N-1)) & ~(N-1));
+        size_t delta = size_t(uintptr_t(buffer) - uintptr_t(b));
+        memset(b, 0, delta);
+        return delta;
     }
 
     static void advance(void*& buffer, size_t& size, size_t offset) {