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

Commit a142d5fd authored by Nathan Egge's avatar Nathan Egge Committed by Automerger Merge Worker
Browse files

Merge "Specify empty paramters as void in ABinderProcess_." am: 504c912d am: f3480955 

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



Change-Id: I9d77cd3be96e7d87a1d34ea5ba888bef6f4304d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1173c5a f3480955

libs/binder/ndk/include_platform/android/binder_process.h

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ __BEGIN_DECLS 
 * Do not use this from a library. Apps setup their own threadpools, and otherwise, the main

 * function should be responsible for configuring the threadpool for the entire application.

 */

void ABinderProcess_startThreadPool();

void ABinderProcess_startThreadPool(void);

/**

 * This sets the maximum number of threads that can be started in the threadpool. By default, after

 * startThreadPool is called, this is 15. If it is called additional times, it will only prevent
@@ -48,7 +48,7 @@ bool ABinderProcess_setThreadPoolMaxThreadCount(uint32_t numThreads); 
 * you should use this in a library to abort if the threadpool is not started.

 * Programs should configure binder threadpools once at the beginning.

 */

bool ABinderProcess_isThreadPoolStarted();

bool ABinderProcess_isThreadPoolStarted(void);

/**

 * This adds the current thread to the threadpool. This may cause the threadpool to exceed the

 * maximum size.
@@ -56,7 +56,7 @@ bool ABinderProcess_isThreadPoolStarted(); 
 * Do not use this from a library. Apps setup their own threadpools, and otherwise, the main

 * function should be responsible for configuring the threadpool for the entire application.

 */

void ABinderProcess_joinThreadPool();

void ABinderProcess_joinThreadPool(void);



/**

 * This gives you an fd to wait on. Whenever data is available on the fd,
@@ -79,6 +79,6 @@ __attribute__((weak)) binder_status_t ABinderProcess_setupPolling(int* fd) __INT 
 *

 * \return STATUS_OK on success

 */

__attribute__((weak)) binder_status_t ABinderProcess_handlePolledCommands() __INTRODUCED_IN(31);

__attribute__((weak)) binder_status_t ABinderProcess_handlePolledCommands(void) __INTRODUCED_IN(31);



__END_DECLS

libs/binder/ndk/process.cpp

+4 −4
Original line number Diff line number Diff line
@@ -24,17 +24,17 @@ 
using ::android::IPCThreadState;

using ::android::ProcessState;



void ABinderProcess_startThreadPool() {

void ABinderProcess_startThreadPool(void) {

    ProcessState::self()->startThreadPool();

    ProcessState::self()->giveThreadPoolName();

}

bool ABinderProcess_setThreadPoolMaxThreadCount(uint32_t numThreads) {

    return ProcessState::self()->setThreadPoolMaxThreadCount(numThreads) == 0;

}

bool ABinderProcess_isThreadPoolStarted() {

bool ABinderProcess_isThreadPoolStarted(void) {

    return ProcessState::self()->isThreadPoolStarted();

}

void ABinderProcess_joinThreadPool() {

void ABinderProcess_joinThreadPool(void) {

    IPCThreadState::self()->joinThreadPool();

}
@@ -42,6 +42,6 @@ binder_status_t ABinderProcess_setupPolling(int* fd) { 
    return IPCThreadState::self()->setupPolling(fd);

}



binder_status_t ABinderProcess_handlePolledCommands() {

binder_status_t ABinderProcess_handlePolledCommands(void) {

    return IPCThreadState::self()->handlePolledCommands();

}