commit 8b1d805ea9ff8cb28ad377d115589d9ac1d755a5
author Jakub Pawlowski <jpawlowski@google.com> Fri Nov 03 19:29:12 2017 -0700
committer Jakub Pawlowski <jpawlowski@google.com> Thu Nov 09 21:23:52 2017 -0800
tree 54a2fd7f849df4b3dcf8da25b2601fa97cc1ac4e
parent ba0ad409f98a9fa5077c0fbb57a9b6a613439a4c

Move createSocketChannel into IBluetoothSocketManager (1/3)

Bug: 68359837
Test: none
Change-Id: Id01e194a265633f26b76fcc542223f7caacfc255

binder/android/bluetooth/IBluetooth.aidl

diff --git a/binder/android/bluetooth/IBluetooth.aidl b/binder/android/bluetooth/IBluetooth.aidl
index 6a6315f..5801eca 100644
--- a/binder/android/bluetooth/IBluetooth.aidl
+++ b/binder/android/bluetooth/IBluetooth.aidl
@@ -100,7 +100,6 @@
 
     // For Socket
     ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in ParcelUuid uuid, int port, int flag);
-    ParcelFileDescriptor createSocketChannel(int type, in String serviceName, in ParcelUuid uuid, int port, int flag);
     IBluetoothSocketManager getSocketManager();
 
     boolean factoryReset();

binder/android/bluetooth/IBluetoothSocketManager.aidl

diff --git a/binder/android/bluetooth/IBluetoothSocketManager.aidl b/binder/android/bluetooth/IBluetoothSocketManager.aidl
index 419a335..4bd7915 100644
--- a/binder/android/bluetooth/IBluetoothSocketManager.aidl
+++ b/binder/android/bluetooth/IBluetoothSocketManager.aidl
@@ -16,6 +16,9 @@
 
 package android.bluetooth;
 
+import android.os.ParcelUuid;
+import android.os.ParcelFileDescriptor;
+
 /**
  * API for Bluetooth Sockets service.
  *
@@ -23,4 +26,5 @@
  */
 interface IBluetoothSocketManager
 {
+    @nullable ParcelFileDescriptor createSocketChannel(int type, in @nullable String serviceName, in @nullable ParcelUuid uuid, int port, int flag);
 }