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

Commit 44e67d95 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BT MAINLINE ParcelFileDescriptor to dup method" am: 1e6ac5e1 am:... 

Merge "BT MAINLINE ParcelFileDescriptor to dup method" am: 1e6ac5e1 am: 42609ea4 am: 1886498d am: 273e99e0

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

Change-Id: Ibe6a01b1e2bce4d0396ac1cbe291120cae898515
parents 0447a404 273e99e0

core/java/android/bluetooth/BluetoothSocket.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -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();