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

Commit d4aa87c5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I2703fb81,Ie95a70c2 

* changes:
  libbinder: separate OS-specific code from Utils.cpp
  libbinder: mix and match binderRpcTest client and services
parents 29d54149 7c0b79f0

libs/binder/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ cc_defaults { 
        "IInterface.cpp",

        "IResultReceiver.cpp",

        "IShellCallback.cpp",

        "OS.cpp",

        "Parcel.cpp",

        "ParcelFileDescriptor.cpp",

        "RpcSession.cpp",

libs/binder/OS.cpp

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "OS.h"



#include <android-base/file.h>

#include <string.h>



using android::base::ErrnoError;

using android::base::Result;



namespace android {



Result<void> 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

libs/binder/OS.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#pragma once



#include <stddef.h>

#include <cstdint>



#include <android-base/result.h>

#include <android-base/unique_fd.h>

#include <utils/Errors.h>



namespace android {



android::base::Result<void> setNonBlocking(android::base::borrowed_fd fd);



status_t getRandomBytes(uint8_t* data, size_t size);



} // namespace android

libs/binder/RpcServer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include "BuildFlags.h"

#include "FdTrigger.h"

#include "OS.h"

#include "RpcSocketAddress.h"

#include "RpcState.h"

#include "RpcWireFormat.h"

libs/binder/RpcSession.cpp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <utils/String8.h>



#include "FdTrigger.h"

#include "OS.h"

#include "RpcSocketAddress.h"

#include "RpcState.h"

#include "RpcWireFormat.h"