Move createSocketChannel into IBluetoothSocketManager (1/3)

Bug: 68359837
Test: none
Change-Id: Id01e194a265633f26b76fcc542223f7caacfc255

diff --git a/binder/android/bluetooth/IBluetooth.aidl b/binder/android/bluetooth/IBluetooth.aidl
index 6a6315f..5801eca 100644 (file)
--- a/binder/android/bluetooth/IBluetooth.aidl
+++ b/binder/android/bluetooth/IBluetooth.aidl
@@ -100,7 +100,6 @@ interface IBluetooth
 
     // 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();

diff --git a/binder/android/bluetooth/IBluetoothSocketManager.aidl b/binder/android/bluetooth/IBluetoothSocketManager.aidl
index 419a335..4bd7915 100644 (file)
--- 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 @@ package android.bluetooth;
  */
 interface IBluetoothSocketManager
 {
+    @nullable ParcelFileDescriptor createSocketChannel(int type, in @nullable String serviceName, in @nullable ParcelUuid uuid, int port, int flag);
 }