commit 3a3f156409e77607ea3f08b5b6970c02a3e4209f
author Krzysztof Kosiński <krzysio@google.com> Wed Feb 03 18:51:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 03 18:51:25 2021 +0000
tree 6f11e53a982536388b29c22896bc1a6c8ae4c1bf
parent c3040bbc3d837d2a18546ac551379026ebd874ce
parent 27aea7119b64b9464110312a20ebc5eec6700f3b

Merge "Fix warnings in libs/binder." am: b54c4d3712 am: 27aea7119b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0c95f171098735c9cf9ff398858e97791d30d92

libs/binder/IpPrefix.cpp

diff --git a/libs/binder/IpPrefix.cpp b/libs/binder/IpPrefix.cpp
index 8d62266..4edc493 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 {
 

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 440c98c..b9d00fe 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2291,7 +2291,7 @@
         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;

libs/binder/PersistableBundle.cpp

diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp
index c807cfe..406fee0 100644
--- a/libs/binder/PersistableBundle.cpp
+++ b/libs/binder/PersistableBundle.cpp
@@ -31,7 +31,6 @@
 using android::BAD_VALUE;
 using android::NO_ERROR;
 using android::Parcel;
-using android::sp;
 using android::status_t;
 using android::UNEXPECTED_NULL;