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

Commit 681662d1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13690702 from b15b52de to 25Q4-release 

Change-Id: I857c71b47c066dbf4a50538cccf69f73209c0277
parents 0e517192 b15b52de

libs/binder/FdTrigger.cpp

+1 −3
Original line number Diff line number Diff line
@@ -61,11 +61,9 @@ bool FdTrigger::isTriggered() { 
}



status_t FdTrigger::triggerablePoll(const android::RpcTransportFd& transportFd, int16_t event) {

#ifdef BINDER_RPC_SINGLE_THREADED

    if (mTriggered) {

    if (isTriggered()) {

        return DEAD_OBJECT;

    }

#endif



    LOG_ALWAYS_FATAL_IF(event == 0, "triggerablePoll %d with event 0 is not allowed",

                        transportFd.fd.get());

libs/binder/RpcServer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -657,6 +657,8 @@ unique_fd RpcServer::releaseServer() { 


status_t RpcServer::setupExternalServer(

        unique_fd serverFd, std::function<status_t(const RpcServer&, RpcTransportFd*)>&& acceptFn) {

    if (status_t res = binder::os::setNonBlocking(serverFd); res != OK) return res;



    RpcMutexLockGuard _l(mLock);

    if (mServer.fd.ok()) {

        ALOGE("Each RpcServer can only have one server.");

libs/binder/RpcSession.cpp

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ status_t RpcSession::setupUnixDomainClient(const char* path) { 
}



status_t RpcSession::setupUnixDomainSocketBootstrapClient(unique_fd bootstrapFd) {

    if (status_t res = binder::os::setNonBlocking(bootstrapFd); res != OK) return res;



    mBootstrapTransport =

            mCtx->newTransport(RpcTransportFd(std::move(bootstrapFd)), mShutdownTrigger.get());

    return setupClient([&](const std::vector<uint8_t>& sessionId, bool incoming) {

libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ interface IPackageManagerNative { 
     *

     * @param permName The name of the permission you are checking for.

     * @param packageName The name of the package you are checking against.

     * @return If the package has the permission, PERMISSION_GRANTED (0) is returned.  If it

     *         does not have the permission, PERMISSION_DENIED (1) is returned.

     * @return PackageManager#PERMISSION_GRANTED (0) is returned if the specified package has the

     *         specified permission, or PackageManager#PERMISSION_DENIED (-1) if it does not.

     */

    int checkPermission(in String permName, in String packageName, in int userId);

libs/binder/tests/parcel_fuzzer/include_random_parcel/fuzzbinder/random_parcel.h

+6 −1
Original line number Diff line number Diff line
@@ -29,7 +29,12 @@ struct RandomParcelOptions { 
    std::vector<sp<IBinder>> extraBinders;

    std::vector<binder::unique_fd> extraFds;



    // internal state owned by fillRandomParcel, for Parcel views

    // Only use extraParcels when this is true. This object needs to outlive

    // the views

    bool viewParcel = false;

    // internal state owned by fillRandomParcel, for Parcel views.

    // This can only be used if this RandomParcelOptions objects is guaranteed

    // to outlive the views.

    std::vector<std::unique_ptr<Parcel>> extraParcels;

};