Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b10226a authored by Steven Moreland's avatar Steven Moreland
Browse files

Keep Parcel size stable. 

The size of 32-bit on arm 'Parcel' was accidentally changed. Fix this by
making stability 16-bits (there is not enough space in Parcel right now
to keep the 32-bit mask without combining some of the bools). This broke
a device in internal master with some 32-bit prebuilts.

Bug: 137348710
Test: TH
Test: boots on hawk
Change-Id: Ifd9aa07ae359557ff94b600c1b64bb565be85dc2
parent a86a3569

libs/binder/Parcel.cpp

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ static size_t pad_size(size_t s) { 


namespace android {



// many things compile this into prebuilts on the stack

static_assert(sizeof(Parcel) == 60 || sizeof(Parcel) == 120);



static pthread_mutex_t gParcelGlobalAllocSizeLock = PTHREAD_MUTEX_INITIALIZER;

static size_t gParcelGlobalAllocSize = 0;

static size_t gParcelGlobalAllocCount = 0;

libs/binder/include/binder/Stability.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ private: 
    // up the efficiency level of a binder object. So, we expose the underlying type.

    friend ::android::Parcel;



    enum Level : int32_t {

    enum Level : int16_t {

        UNDECLARED = 0,



        VENDOR = 0b000011,