Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"

Browse Source 
* changes:
  Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)
  Add IBluetoothSocketManager (3/3)
This commit is contained in:
Jakub Pawlowski
2017-11-09 22:11:38 +00:00
committed by Gerrit Code Review
parent 08d23cf07a db62b26ba0
commit b2bde067c2
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@@ -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 \

2
core/java/android/os/ParcelFileDescriptor.aidl
View File

@@ -17,4 +17,4 @@
package android.os;
parcelable ParcelFileDescriptor;
parcelable ParcelFileDescriptor cpp_header "android/os/parcel_file_descriptor.h";

2
core/java/android/os/ParcelUuid.aidl
View File

@@ -16,4 +16,4 @@
package android.os;
parcelable ParcelUuid;
parcelable ParcelUuid cpp_header "android/os/parcel_uuid.h";