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

Commit 2000d3c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BT MAINLINE ParcelFileDescriptor to dup method" am: 555c9561 am: ab34ebc6 

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

Change-Id: I2b590a5ba739720834f27e9cedd2d01fbd5a7032
parents 71b14e13 ab34ebc6

framework/java/android/bluetooth/BluetoothSocket.java

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.bluetooth; 


import android.annotation.RequiresNoPermission;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.LocalSocket;
@@ -266,7 +265,7 @@ public final class BluetoothSocket implements Closeable { 
            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.mSocketIS = as.mSocket.getInputStream();

        as.mSocketOS = as.mSocket.getOutputStream();