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

Commit 134fddb9 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r43' into HEAD 

Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)

Change-Id: I1d6a9cc67ded5dd7d0ee1f17773e326ac0ae87ce
parents 3ce4ffc4 a59b8278

libs/binder/IPCThreadState.cpp

+10 −2
Original line number Diff line number Diff line
@@ -1083,8 +1083,16 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
                    << reinterpret_cast<const size_t*>(tr.data.ptr.offsets) << endl;

            }

            if (tr.target.ptr) {

                sp<BBinder> b((BBinder*)tr.cookie);

                error = b->transact(tr.code, buffer, &reply, tr.flags);

                // We only have a weak reference on the target object, so we must first try to

                // safely acquire a strong reference before doing anything else with it.

                if (reinterpret_cast<RefBase::weakref_type*>(

                        tr.target.ptr)->attemptIncStrong(this)) {

                    error = reinterpret_cast<BBinder*>(tr.cookie)->transact(tr.code, buffer,

                            &reply, tr.flags);

                    reinterpret_cast<BBinder*>(tr.cookie)->decStrong(this);

                } else {

                    error = UNKNOWN_TRANSACTION;

                }



            } else {

                error = the_context_object->transact(tr.code, buffer, &reply, tr.flags);

libs/gui/IGraphicBufferConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ status_t BnGraphicBufferConsumer::onTransact( 
        }

        case GET_RELEASED_BUFFERS: {

            CHECK_INTERFACE(IGraphicBufferConsumer, data, reply);

            uint64_t slotMask;

            uint64_t slotMask = 0;

            status_t result = getReleasedBuffers(&slotMask);

            reply->writeInt64(static_cast<int64_t>(slotMask));

            reply->writeInt32(result);

libs/gui/IGraphicBufferProducer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ status_t BnGraphicBufferProducer::onTransact( 
            QueueBufferOutput* const output =

                    reinterpret_cast<QueueBufferOutput *>(

                            reply->writeInplace(sizeof(QueueBufferOutput)));

            memset(output, 0, sizeof(QueueBufferOutput));

            status_t res = connect(listener, api, producerControlledByApp, output);

            reply->writeInt32(res);

            return NO_ERROR;