Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2bde067 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" 

* changes:
  Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)
  Add IBluetoothSocketManager (3/3)
parents 08d23cf0 db62b26b

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 \

core/java/android/os/ParcelFileDescriptor.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,4 +17,4 @@ 


package android.os;



parcelable ParcelFileDescriptor;
 
parcelable ParcelFileDescriptor cpp_header "android/os/parcel_file_descriptor.h";

core/java/android/os/ParcelUuid.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


package android.os;



parcelable ParcelUuid;
 
parcelable ParcelUuid cpp_header "android/os/parcel_uuid.h";