| commit | 7b38581dede09c956291cbdbbcdfa15311a399c8 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Fri Nov 10 08:22:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 10 08:22:05 2017 +0000 |
| tree | bf1c095b575093a49ae9592b504aec33e69ce8ff | |
| parent | 80662de731b0e78e4981c18ddfee42a2d364ae5e [diff] | |
| parent | 3e9b9b74b451af1f81121eb8d819957ffe1aac6b [diff] |
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am: 3e9b9b74b4 Change-Id: Ic98a1281eb6f3f6d1deb450c5123913b2c8d25a6
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index 4035ee1..23956e1 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -417,7 +417,7 @@ return -1; } try { - mPfd = bluetoothProxy.createSocketChannel(mType, mServiceName, + mPfd = bluetoothProxy.getSocketManager().createSocketChannel(mType, mServiceName, mUuid, mPort, getSecurityFlags()); } catch (RemoteException e) { Log.e(TAG, Log.getStackTraceString(new Throwable()));