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

Commit 0b3fcdf1 authored by Jack He's avatar Jack He Committed by Gerrit Code Review
Browse files

Merge changes from topic "bt-api-update" 

* changes:
  LE Audio: Expose more system APIs
  hap: Add initial implementation
  Introduce LE audio broadcast system APIs
  leaudio: Improve Volume Control API
  LE Scanner: Add AD TYPE filter APIs
  Add API to set the codec preference for specific device
  Add API to get identity address
parents fe6f2d01 421c8fbd

android/app/jni/com_android_bluetooth.h

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ int register_com_android_bluetooth_sdp(JNIEnv* env); 


int register_com_android_bluetooth_hearing_aid(JNIEnv* env);



int register_com_android_bluetooth_hap_client(JNIEnv* env);



int register_com_android_bluetooth_btservice_BluetoothKeystore(JNIEnv* env);



int register_com_android_bluetooth_btservice_activity_attribution(JNIEnv* env);

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1920,6 +1920,13 @@ jint JNI_OnLoad(JavaVM* jvm, void* reserved) { 
    return JNI_ERR;

  }



  status = android::register_com_android_bluetooth_hap_client(e);

  if (status < 0) {

    ALOGE("jni le audio hearing access client registration failure: %d",

          status);

    return JNI_ERR;

  }



  status = android::register_com_android_bluetooth_le_audio(e);

  if (status < 0) {

    ALOGE("jni le_audio registration failure: %d", status);

android/app/jni/com_android_bluetooth_hap_client.cpp

0 → 100644
+647 −0

File added.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+46 −3

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/btservice/storage/Metadata.java

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ class Metadata { 
            case BluetoothProfile.HEARING_AID:

                profileConnectionPolicies.hearing_aid_connection_policy = connectionPolicy;

                break;

            case BluetoothProfile.HAP_CLIENT:

                profileConnectionPolicies.hap_client_connection_policy = connectionPolicy;

                break;

            case BluetoothProfile.LE_AUDIO:

                profileConnectionPolicies.le_audio_connection_policy = connectionPolicy;

                break;
@@ -153,6 +156,8 @@ class Metadata { 
                return profileConnectionPolicies.sap_connection_policy;

            case BluetoothProfile.HEARING_AID:

                return profileConnectionPolicies.hearing_aid_connection_policy;

            case BluetoothProfile.HAP_CLIENT:

                return profileConnectionPolicies.hap_client_connection_policy;

            case BluetoothProfile.LE_AUDIO:

                return profileConnectionPolicies.le_audio_connection_policy;

            case BluetoothProfile.VOLUME_CONTROL: