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

Merge "BT MAINLINE ParcelFileDescriptor to dup method" am: 1e6ac5e1ff am: 42609ea486 am: 1886498d3a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895130

Change-Id: I75f977b977857072425e9a53fff7d7fcd083401d
This commit is contained in:
Treehugger Robot
2021-11-29 18:13:07 +00:00
committed by Automerger Merge Worker
parent 9c09c1bfde 1886498d3a
commit 273e99e039
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/bluetooth/BluetoothSocket.java
View File

@@ -18,7 +18,6 @@ package android.bluetooth;
import android.annotation.RequiresNoPermission; import android.annotation.RequiresNoPermission;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SuppressLint;
import android.bluetooth.annotations.RequiresBluetoothConnectPermission; import android.bluetooth.annotations.RequiresBluetoothConnectPermission;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.net.LocalSocket; import android.net.LocalSocket;
@@ -266,7 +265,7 @@ public final class BluetoothSocket implements Closeable {
throw new IOException("bt socket acept failed"); throw new IOException("bt socket acept failed");
} }
as.mPfd = new ParcelFileDescriptor(fds[0]); as.mPfd = ParcelFileDescriptor.dup(fds[0]);
as.mSocket = LocalSocket.createConnectedLocalSocket(fds[0]); as.mSocket = LocalSocket.createConnectedLocalSocket(fds[0]);
as.mSocketIS = as.mSocket.getInputStream(); as.mSocketIS = as.mSocket.getInputStream();
as.mSocketOS = as.mSocket.getOutputStream(); as.mSocketOS = as.mSocket.getOutputStream();