Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 49c8948d12

Change-Id: Ia0addb7e869191555ee2ebf8afabb6c0cbe50cb5
This commit is contained in:
Erik Kline
2017-08-28 07:14:47 +00:00
committed by android-build-merger
parent 6916aad046 49c8948d12
commit 9548ce5a72
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
View File

@@ -74,10 +74,9 @@ int conntrackSocket(unsigned groups) {
hidl_handle handleFromFileDescriptor(base::unique_fd fd) {
hidl_handle h;
NATIVE_HANDLE_DECLARE_STORAGE(storage, 0, 0);
static constexpr int kNumFds = 1;
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();
static constexpr bool kTakeOwnership = true;