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

Commit b074a923 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-7fec959a40764617b57e2cea2d11e35d" 

* changes:
  Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067 am: 64a1fbb8 am: 874ab0ef
  Add IBluetoothSocketManager (3/3) am: 422af4d0 am: 6e78c792 am: 4a734916
parents 78c059ff c411b3d4

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,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";