summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jakub Pawlowski <jpawlowski@google.com> 2017-11-10 08:31:40 +0000
committer android-build-merger <android-build-merger@google.com> 2017-11-10 08:31:40 +0000
commit222f4a2c81d512a53e27fd012d6c549d9deccf81 (patch)
treeb91e0ed9edb2de15b81acdf635252252d8028ade
parente5cfbed9f8a327453769aeb4490416cb6067f2dc (diff)
parent7b38581dede09c956291cbdbbcdfa15311a399c8 (diff)
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am: 3e9b9b74b4
am: 7b38581ded Change-Id: I87b40395aa73c8f2d159adf2ac46a95cc70f300c
-rw-r--r--core/java/android/bluetooth/BluetoothSocket.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java
index 4035ee1beb8f..23956e14d9e5 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -417,7 +417,7 @@ public final class BluetoothSocket implements Closeable {
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()));