From 7c0b79f00a17e0a284b519418655c539dc0f3940 Mon Sep 17 00:00:00 2001 From: Andrei Homescu Date: Thu, 30 Jun 2022 02:00:46 +0000 Subject: libbinder: separate OS-specific code from Utils.cpp Separate the OS-specific functions setNonBlocking and getRandomBytes from Utils.cpp into a separate OS-specific OS.cpp file that other operating systems can override at build time. Bug: 224644083 Test: build Trusty Change-Id: I2703fb81d4370b5f6264556ae57fdddb0573971a --- libs/binder/Utils.cpp | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'libs/binder/Utils.cpp') diff --git a/libs/binder/Utils.cpp b/libs/binder/Utils.cpp index b0289a7196..0314b0fea7 100644 --- a/libs/binder/Utils.cpp +++ b/libs/binder/Utils.cpp @@ -16,40 +16,12 @@ #include "Utils.h" -#include #include -using android::base::ErrnoError; -using android::base::Result; - namespace android { void zeroMemory(uint8_t* data, size_t size) { memset(data, 0, size); } -Result setNonBlocking(android::base::borrowed_fd fd) { - int flags = TEMP_FAILURE_RETRY(fcntl(fd.get(), F_GETFL)); - if (flags == -1) { - return ErrnoError() << "Could not get flags for fd"; - } - if (int ret = TEMP_FAILURE_RETRY(fcntl(fd.get(), F_SETFL, flags | O_NONBLOCK)); ret == -1) { - return ErrnoError() << "Could not set non-blocking flag for fd"; - } - return {}; -} - -status_t getRandomBytes(uint8_t* data, size_t size) { - int ret = TEMP_FAILURE_RETRY(open("/dev/urandom", O_RDONLY | O_CLOEXEC | O_NOFOLLOW)); - if (ret == -1) { - return -errno; - } - - base::unique_fd fd(ret); - if (!base::ReadFully(fd, data, size)) { - return -errno; - } - return OK; -} - } // namespace android -- cgit v1.2.3-59-g8ed1b