diff options
| author | 2021-02-03 18:10:27 +0000 | |
|---|---|---|
| committer | 2021-02-03 18:10:27 +0000 | |
| commit | 27aea7119b64b9464110312a20ebc5eec6700f3b (patch) | |
| tree | 76c0c857653427d47e415941215244d6612f6e9d | |
| parent | 1fb7c54d178b022631560bdcc778f706822b5ced (diff) | |
| parent | b54c4d3712936f84deacda2b3c37eee7f80a818c (diff) | |
Merge "Fix warnings in libs/binder." am: b54c4d3712
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1571379
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22d21ac12fb472d9bea3102c102aa73d8ec97455
| -rw-r--r-- | libs/binder/IpPrefix.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/PersistableBundle.cpp | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/libs/binder/IpPrefix.cpp b/libs/binder/IpPrefix.cpp index 8d622668cc..4edc493f11 100644 --- a/libs/binder/IpPrefix.cpp +++ b/libs/binder/IpPrefix.cpp @@ -24,12 +24,10 @@ #include <log/log.h> #include <utils/Errors.h> -using android::BAD_TYPE; using android::BAD_VALUE; using android::NO_ERROR; using android::Parcel; using android::status_t; -using android::UNEXPECTED_NULL; namespace android { diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 8087443720..8dab98ebee 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -2285,7 +2285,7 @@ int Parcel::readParcelFileDescriptor() const ssize_t written = TEMP_FAILURE_RETRY( ::write(comm, &message, sizeof(message))); - if (written == -1 || written != sizeof(message)) { + if (written != sizeof(message)) { ALOGW("Failed to detach ParcelFileDescriptor written: %zd err: %s", written, strerror(errno)); return BAD_TYPE; diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp index c807cfe89a..406fee0227 100644 --- a/libs/binder/PersistableBundle.cpp +++ b/libs/binder/PersistableBundle.cpp @@ -31,7 +31,6 @@ using android::BAD_TYPE; using android::BAD_VALUE; using android::NO_ERROR; using android::Parcel; -using android::sp; using android::status_t; using android::UNEXPECTED_NULL; |