From 422af4d04962b029958ddb6897fd9ef2d3a012b3 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Wed, 1 Nov 2017 10:12:36 -0700 Subject: [PATCH 1/2] Add IBluetoothSocketManager (3/3) Add IBluetoothSocketManager native Binder implementation. Thanks to it we'll skip jni to native calls, and need to re-serialize data manually. Bug: 68359837 Test: none Change-Id: I6c99717aa18ab41addf96b7536e483ae12802601 --- Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.mk b/Android.mk index 4e036b598027f..dd5379309234e 100644 --- a/Android.mk +++ b/Android.mk @@ -138,6 +138,7 @@ LOCAL_SRC_FILES += \ ../../system/bt/binder/android/bluetooth/IBluetoothPbap.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothPbapClient.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothSap.aidl \ + ../../system/bt/binder/android/bluetooth/IBluetoothSocketManager.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothStateChangeCallback.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothHeadsetClient.aidl \ ../../system/bt/binder/android/bluetooth/IBluetoothHidDevice.aidl \ From db62b26ba0c0d15e271fb6b15754cc2b9e642854 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Wed, 1 Nov 2017 15:27:17 -0700 Subject: [PATCH 2/2] Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2) Bug: 68359837 Test: compile Change-Id: I3cec0b5b20dde33be09a5bbc451cd79273c67961 --- core/java/android/os/ParcelFileDescriptor.aidl | 2 +- core/java/android/os/ParcelUuid.aidl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/os/ParcelFileDescriptor.aidl b/core/java/android/os/ParcelFileDescriptor.aidl index 5857aae5c599a..6bbd99e3f20a2 100644 --- a/core/java/android/os/ParcelFileDescriptor.aidl +++ b/core/java/android/os/ParcelFileDescriptor.aidl @@ -17,4 +17,4 @@ package android.os; -parcelable ParcelFileDescriptor; +parcelable ParcelFileDescriptor cpp_header "android/os/parcel_file_descriptor.h"; diff --git a/core/java/android/os/ParcelUuid.aidl b/core/java/android/os/ParcelUuid.aidl index f7e080ac5901c..6f3629796bde9 100644 --- a/core/java/android/os/ParcelUuid.aidl +++ b/core/java/android/os/ParcelUuid.aidl @@ -16,4 +16,4 @@ package android.os; -parcelable ParcelUuid; +parcelable ParcelUuid cpp_header "android/os/parcel_uuid.h";