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

Commit 34a61908 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ib772fcf0,I413150da,Ic1ebdfca into main 

* changes:
  Add single-threaded ifdef guard for FdTrigger.cpp
  Fix variable shadow compilation issue in BBinder::transact
  Remove unneeded includes in binder code
parents 1d42093c 3ad88e2d

libs/binder/Binder.cpp

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <binder/RecordedTransaction.h>

#include <binder/RpcServer.h>

#include <binder/unique_fd.h>

#include <pthread.h>



#include <inttypes.h>

#include <stdio.h>
@@ -428,7 +427,7 @@ status_t BBinder::transact( 
                    fromDetails(getInterfaceDescriptor(), code, flags, ts, data,

                                reply ? *reply : emptyReply, err);

            if (transaction) {

                if (status_t err = transaction->dumpToFile(e->mRecordingFd); err != NO_ERROR) {

                if (err = transaction->dumpToFile(e->mRecordingFd); err != NO_ERROR) {

                    ALOGI("Failed to dump RecordedTransaction to file with error %d", err);

                }

            } else {

libs/binder/FdTrigger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 


#include <binder/Functional.h>



#ifndef BINDER_RPC_SINGLE_THREADED

#include "FdUtils.h"

#endif // BINDER_RPC_SINGLE_THREADED

#include "RpcState.h"

#include "Utils.h"

libs/binder/Parcel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <errno.h>

#include <fcntl.h>

#include <inttypes.h>

#include <pthread.h>

#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>

libs/binder/include/binder/RpcServer.h

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <utils/RefBase.h>



#include <bitset>

#include <mutex>

#include <thread>



namespace android {