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

Commit f4ebed02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix address consolidation when creating sockets" into tm-qpr-dev am: f7974f3c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21456264



Change-Id: I82b145de6ecca6ea32f89b57adaa0c43b8bed3ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2f81516 f7974f3c

android/app/src/com/android/bluetooth/btservice/BluetoothSocketManagerBinder.java

+12 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.bluetooth.btservice;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothSocket;

import android.bluetooth.IBluetoothSocketManager;

import android.os.Binder;

import android.os.ParcelFileDescriptor;
@@ -49,8 +50,12 @@ class BluetoothSocketManagerBinder extends IBluetoothSocketManager.Stub { 
            return null;

        }



        return marshalFd(mService.connectSocketNative(

            Utils.getBytesFromAddress(device.getAddress()),

        return marshalFd(

                mService.connectSocketNative(

                        Utils.getBytesFromAddress(

                                type == BluetoothSocket.TYPE_L2CAP_LE

                                        ? device.getAddress()

                                        : mService.getIdentityAddress(device.getAddress())),

                        type,

                        Utils.uuidToByteArray(uuid),

                        port,