commit e83cac702c7f0844a1878f2c780518f3cfcdf094
author Jakub Pawlowski <jpawlowski@google.com> Fri Nov 10 08:42:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 10 08:42:32 2017 +0000
tree 997a94d0eefa7944e636adad44f33686146ecfa0
parent 920a4e2f1d1c7c2e2b2d58413c01003dc7529607
parent 222f4a2c81d512a53e27fd012d6c549d9deccf81

Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am: 3e9b9b74b4 am: 7b38581ded
am: 222f4a2c81

Change-Id: I88dd168c05343ed2cd2715a2b6da8eb5bae69600

core/java/android/bluetooth/BluetoothSocket.java

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()));