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

Commit e5ab8b37 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes I6c715612,If84ff928 am: 2281985c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1696388

Change-Id: I40a4def2d931c8789f0c6993b34a6676a1d684cd
parents 92e674bb 2281985c

libs/binder/IPCThreadState.cpp

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <utils/SystemClock.h>

#include <utils/threads.h>



#include <private/binder/binder_module.h>



#include <atomic>

#include <errno.h>

#include <inttypes.h>
@@ -43,6 +41,7 @@ 
#include <unistd.h>



#include "Static.h"

#include "binder_module.h"



#if LOG_NDEBUG

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ 
#include <utils/String8.h>

#include <utils/misc.h>



#include <private/binder/binder_module.h>

#include "RpcState.h"

#include "Static.h"

#include "Utils.h"

#include "binder_module.h"



#define LOG_REFS(...)

//#define LOG_REFS(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)

libs/binder/ProcessState.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
#include <utils/String8.h>

#include <utils/threads.h>



#include <private/binder/binder_module.h>

#include "Static.h"

#include "binder_module.h"



#include <errno.h>

#include <fcntl.h>

libs/binder/RpcServer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ std::vector<sp<RpcConnection>> RpcServer::listConnections() { 
}



bool RpcServer::setupSocketServer(const RpcSocketAddress& addr) {

    LOG_RPC_DETAIL("Setting up socket server %s", addr.toString().c_str());



    {

        std::lock_guard<std::mutex> _l(mLock);

        LOG_ALWAYS_FATAL_IF(mServer.get() != -1, "Each RpcServer can only have one server.");
@@ -208,6 +210,8 @@ bool RpcServer::setupSocketServer(const RpcSocketAddress& addr) { 
        return false;

    }



    LOG_RPC_DETAIL("Successfully setup socket server %s", addr.toString().c_str());



    mServer = std::move(serverFd);

    return true;

}

libs/binder/include/private/binder/binder_module.h→libs/binder/binder_module.h

+13 −13
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
#undef B_PACK_CHARS

#endif



#include <sys/ioctl.h>

#include <linux/android/binder.h>

#include <sys/ioctl.h>



#ifndef BR_FROZEN_REPLY

// Temporary definition of BR_FROZEN_REPLY. For production