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

Commit 9548ce5a authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "switch to native_handle_create() for passing ownership" into oc-mr1-dev am: 91f4071f 

am: 49c8948d

Change-Id: Ia0addb7e869191555ee2ebf8afabb6c0cbe50cb5
parents 6916aad0 49c8948d

services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -74,10 +74,9 @@ int conntrackSocket(unsigned groups) { 
hidl_handle handleFromFileDescriptor(base::unique_fd fd) {

hidl_handle handleFromFileDescriptor(base::unique_fd fd) {

    hidl_handle h;

    hidl_handle h;





    NATIVE_HANDLE_DECLARE_STORAGE(storage, 0, 0);

    static constexpr int kNumFds = 1;

    static constexpr int kNumFds = 1;

    static constexpr int kNumInts = 0;

    static constexpr int kNumInts = 0;

    native_handle_t *nh = native_handle_init(storage, kNumFds, kNumInts);

    native_handle_t *nh = native_handle_create(kNumFds, kNumInts);

    nh->data[0] = fd.release();

    nh->data[0] = fd.release();





    static constexpr bool kTakeOwnership = true;

    static constexpr bool kTakeOwnership = true;