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

Commit e1d853ee authored by Krzysztof Kosiński's avatar Krzysztof Kosiński Committed by Automerger Merge Worker
Browse files

Merge "Fix warnings in libs/binder." am: b54c4d37 am: 27aea711 am: 3a3f1564 am: 477fef40 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib582919e9e760e56d5df7ca5f6d940ff07c8b98f
parents 66625cc0 477fef40

libs/binder/IpPrefix.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -24,12 +24,10 @@ 
#include <log/log.h>

#include <log/log.h>

#include <utils/Errors.h>

#include <utils/Errors.h>





using android::BAD_TYPE;

using android::BAD_VALUE;

using android::BAD_VALUE;

using android::NO_ERROR;

using android::NO_ERROR;

using android::Parcel;

using android::Parcel;

using android::status_t;

using android::status_t;

using android::UNEXPECTED_NULL;





namespace android {

namespace android {

libs/binder/Parcel.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -2291,7 +2291,7 @@ int Parcel::readParcelFileDescriptor() const 
        ssize_t written = TEMP_FAILURE_RETRY(

        ssize_t written = TEMP_FAILURE_RETRY(

            ::write(comm, &message, sizeof(message)));

            ::write(comm, &message, sizeof(message)));





        if (written == -1 || written != sizeof(message)) {

        if (written != sizeof(message)) {

            ALOGW("Failed to detach ParcelFileDescriptor written: %zd err: %s",

            ALOGW("Failed to detach ParcelFileDescriptor written: %zd err: %s",

                written, strerror(errno));

                written, strerror(errno));

            return BAD_TYPE;

            return BAD_TYPE;

libs/binder/PersistableBundle.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ using android::BAD_TYPE; 
using android::BAD_VALUE;

using android::BAD_VALUE;

using android::NO_ERROR;

using android::NO_ERROR;

using android::Parcel;

using android::Parcel;

using android::sp;

using android::status_t;

using android::status_t;

using android::UNEXPECTED_NULL;

using android::UNEXPECTED_NULL;