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

Commit 262701e2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7339742 from 92ffb488 to sc-release 

Change-Id: I96b2884b2c81a81da5c82df5b378be9c44736d43
parents 6b81e39a 92ffb488

include/android/surface_control.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -526,6 +526,9 @@ void ASurfaceTransaction_setFrameRate(ASurfaceTransaction* transaction, 
 * callback timings, and changes to the time interval at which the system releases buffers back to

 * callback timings, and changes to the time interval at which the system releases buffers back to

 * the application.

 * the application.

 *

 *

 * You can register for changes in the refresh rate using

 * \a AChoreographer_registerRefreshRateCallback.

 *

 * \param frameRate is the intended frame rate of this surface, in frames per second. 0 is a special

 * \param frameRate is the intended frame rate of this surface, in frames per second. 0 is a special

 * value that indicates the app will accept the system's choice for the display frame rate, which is

 * value that indicates the app will accept the system's choice for the display frame rate, which is

 * the default behavior if this function isn't called. The frameRate param does <em>not</em> need to

 * the default behavior if this function isn't called. The frameRate param does <em>not</em> need to

libs/binder/IPCThreadState.cpp

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

#include <utils/SystemClock.h>

#include <utils/threads.h>

#include <utils/threads.h>





#include <private/binder/binder_module.h>



#include <atomic>

#include <atomic>

#include <errno.h>

#include <errno.h>

#include <inttypes.h>

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

#include <unistd.h>





#include "Static.h"

#include "Static.h"

#include "binder_module.h"





#if LOG_NDEBUG

#if LOG_NDEBUG

libs/binder/Parcel.cpp

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

#include <utils/String8.h>

#include <utils/misc.h>

#include <utils/misc.h>





#include <private/binder/binder_module.h>

#include "RpcState.h"

#include "RpcState.h"

#include "Static.h"

#include "Static.h"

#include "Utils.h"

#include "Utils.h"

#include "binder_module.h"





#define LOG_REFS(...)

#define LOG_REFS(...)

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

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

libs/binder/ProcessState.cpp

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

#include <utils/String8.h>

#include <utils/threads.h>

#include <utils/threads.h>





#include <private/binder/binder_module.h>

#include "Static.h"

#include "Static.h"

#include "binder_module.h"





#include <errno.h>

#include <errno.h>

#include <fcntl.h>

#include <fcntl.h>

libs/binder/RpcServer.cpp

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

}





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

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);

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

        LOG_ALWAYS_FATAL_IF(mServer.get() != -1, "Each RpcServer can only have one server.");

        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;

        return false;

    }

    }





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



    mServer = std::move(serverFd);

    mServer = std::move(serverFd);

    return true;

    return true;

}

}