diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-11-14 01:23:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-14 01:23:04 +0000 |
| commit | 58de99a2487353a7b1434e67e955fcaccd9d0c85 (patch) | |
| tree | df0fc520d6e1070bc4d29535d52d2d4a1ad5ed7b /core/java | |
| parent | 8fd59b38b70d152003925bed2754c2a6d017fdcd (diff) | |
| parent | 9c26701b35c0750afc4c669a385988ea37602a5b (diff) | |
Merge "Move connectSocket into IBluetoothSocketManager (3/3)" am: 8d742759cc
am: 9c26701b35
Change-Id: I8d0d486b73f8b8130db216a42f1ff045875e3849
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothSocket.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index 23956e14d9e5..0569913435a8 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -375,7 +375,7 @@ public final class BluetoothSocket implements Closeable { IBluetooth bluetoothProxy = BluetoothAdapter.getDefaultAdapter().getBluetoothService(null); if (bluetoothProxy == null) throw new IOException("Bluetooth is off"); - mPfd = bluetoothProxy.connectSocket(mDevice, mType, + mPfd = bluetoothProxy.getSocketManager().connectSocket(mDevice, mType, mUuid, mPort, getSecurityFlags()); synchronized (this) { if (DBG) Log.d(TAG, "connect(), SocketState: " + mSocketState + ", mPfd: " + mPfd); |