commit 6f54dca05107d4da9bb66c467967d950e4f1e14b
author Tianyu Jiang <tianyuj@google.com> Tue Jan 29 12:46:35 2019 -0800
committer Tianyu Jiang <tianyuj@google.com> Wed Jan 30 01:37:57 2019 +0000
tree a78b1b651cb5e12a00f7bb044322985c8c785c4c
parent 7de6f68ff865afa3b329b605b78d0cf0df2a050d

Clean up initWithBufferTraits

Bug: None
Test: BufferHub_test BufferHubServer_test VtsHalBufferHubV1_0TargetTest
Change-Id: I3b386c3710ca1268587e3a3b03632e02cd353b6e

libs/ui/BufferHubBuffer.cpp

diff --git a/libs/ui/BufferHubBuffer.cpp b/libs/ui/BufferHubBuffer.cpp
index f3856d0..4b3d3ba 100644
--- a/libs/ui/BufferHubBuffer.cpp
+++ b/libs/ui/BufferHubBuffer.cpp
@@ -167,32 +167,30 @@
         return -EINVAL;
     }
 
+    // Import fds. Dup fds because hidl_handle owns the fds.
+    unique_fd ashmemFd(fcntl(bufferTraits.bufferInfo->data[0], F_DUPFD_CLOEXEC, 0));
+    mMetadata = BufferHubMetadata::Import(std::move(ashmemFd));
+    if (!mMetadata.IsValid()) {
+        ALOGE("%s: Received an invalid metadata.", __FUNCTION__);
+        return -EINVAL;
+    }
+
+    mEventFd = BufferHubEventFd(fcntl(bufferTraits.bufferInfo->data[1], F_DUPFD_CLOEXEC, 0));
+    if (!mEventFd.isValid()) {
+        ALOGE("%s: Received ad invalid event fd.", __FUNCTION__);
+        return -EINVAL;
+    }
+
     int bufferId = bufferTraits.bufferInfo->data[2];
     if (bufferId < 0) {
-        ALOGE("%s: Received an invalid (negative) id!", __FUNCTION__);
+        ALOGE("%s: Received an invalid (negative) id.", __FUNCTION__);
         return -EINVAL;
     }
 
     uint32_t clientBitMask;
     memcpy(&clientBitMask, &bufferTraits.bufferInfo->data[3], sizeof(clientBitMask));
     if (clientBitMask == 0U) {
-        ALOGE("%s: Received a invalid client state mask!", __FUNCTION__);
-        return -EINVAL;
-    }
-
-    // Import fds. Dup fds because hidl_handle owns the fds.
-    const int eventFd = fcntl(bufferTraits.bufferInfo->data[1], F_DUPFD_CLOEXEC, 0);
-    if (eventFd < 0) {
-        ALOGE("%s: Received a invalid event fd!", __FUNCTION__);
-        return -EINVAL;
-    }
-    mEventFd = BufferHubEventFd(eventFd);
-
-    unique_fd ashmemFd(fcntl(bufferTraits.bufferInfo->data[0], F_DUPFD_CLOEXEC, 0));
-    mMetadata = BufferHubMetadata::Import(std::move(ashmemFd));
-
-    if (!mMetadata.IsValid()) {
-        ALOGE("%s: invalid metadata.", __FUNCTION__);
+        ALOGE("%s: Received an invalid client state mask.", __FUNCTION__);
         return -EINVAL;
     }