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

Commit a4147132 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12348750 from 2e949362 to 24Q4-release 

Change-Id: I9a8a6c2b96900b7a59f19d400886fb6ed2560a7b
parents 91cf378d 2e949362

android/ChannelSoundingTestApp/app/src/main/java/com/android/bluetooth/channelsoundingtestapp/DistanceMeasurementInitiator.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,7 @@ class DistanceMeasurementInitiator { 
    void setTargetDevice(BluetoothDevice targetDevice) {

    void setTargetDevice(BluetoothDevice targetDevice) {

        mTargetDevice = targetDevice;

        mTargetDevice = targetDevice;

    }

    }



    private void printLog(String log) {

    private void printLog(String log) {

        mLoggingListener.onLog(log);

        mLoggingListener.onLog(log);

    }

    }

android/app/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -343,6 +343,7 @@ android_app { 
            "-Xep:InvalidParam:ERROR",

            "-Xep:InvalidParam:ERROR",

            "-Xep:LoopOverCharArray:ERROR",

            "-Xep:LoopOverCharArray:ERROR",

            "-Xep:MissingCasesInEnumSwitch:ERROR",

            "-Xep:MissingCasesInEnumSwitch:ERROR",

            "-Xep:MixedMutabilityReturnType:ERROR",

            "-Xep:MockNotUsedInProduction:ERROR",

            "-Xep:MockNotUsedInProduction:ERROR",

            "-Xep:ModifyCollectionInEnhancedForLoop:ERROR",

            "-Xep:ModifyCollectionInEnhancedForLoop:ERROR",

            "-Xep:NarrowCalculation:ERROR",

            "-Xep:NarrowCalculation:ERROR",

android/app/jni/com_android_bluetooth_vc.cpp

+336 −3
Original line number Original line Diff line number Diff line
@@ -36,6 +36,11 @@ static jmethodID method_onDeviceAvailable; 
static jmethodID method_onExtAudioOutVolumeOffsetChanged;

static jmethodID method_onExtAudioOutVolumeOffsetChanged;

static jmethodID method_onExtAudioOutLocationChanged;

static jmethodID method_onExtAudioOutLocationChanged;

static jmethodID method_onExtAudioOutDescriptionChanged;

static jmethodID method_onExtAudioOutDescriptionChanged;

static jmethodID method_onExtAudioInStateChanged;

static jmethodID method_onExtAudioInStatusChanged;

static jmethodID method_onExtAudioInTypeChanged;

static jmethodID method_onExtAudioInGainPropsChanged;

static jmethodID method_onExtAudioInDescriptionChanged;





static VolumeControlInterface* sVolumeControlInterface = nullptr;

static VolumeControlInterface* sVolumeControlInterface = nullptr;

static std::shared_timed_mutex interface_mutex;

static std::shared_timed_mutex interface_mutex;
@@ -105,7 +110,8 @@ public: 
                                 (jboolean)mute, group_id, (jboolean)isAutonomous);

                                 (jboolean)mute, group_id, (jboolean)isAutonomous);

  }

  }





  void OnDeviceAvailable(const RawAddress& bd_addr, uint8_t num_offsets) override {

  void OnDeviceAvailable(const RawAddress& bd_addr, uint8_t num_offsets,

                         uint8_t num_inputs) override {

    log::info("");

    log::info("");





    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);
@@ -124,7 +130,7 @@ public: 
    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));

                                     reinterpret_cast<const jbyte*>(&bd_addr));

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onDeviceAvailable, (jint)num_offsets,

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onDeviceAvailable, (jint)num_offsets,

                                 addr.get());

                                 (jint)num_inputs, addr.get());

  }

  }





  void OnExtAudioOutVolumeOffsetChanged(const RawAddress& bd_addr, uint8_t ext_output_id,

  void OnExtAudioOutVolumeOffsetChanged(const RawAddress& bd_addr, uint8_t ext_output_id,
@@ -200,6 +206,122 @@ public: 
    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onExtAudioOutDescriptionChanged,

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onExtAudioOutDescriptionChanged,

                                 (jint)ext_output_id, description, addr.get());

                                 (jint)ext_output_id, description, addr.get());

  }

  }



  void OnExtAudioInStateChanged(const RawAddress& bd_addr, uint8_t ext_input_id, int8_t gain_val,

                                uint8_t gain_mode, bool mute) override {

    log::info("");



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) {

      return;

    }



    ScopedLocalRef<jbyteArray> addr(sCallbackEnv.get(),

                                    sCallbackEnv->NewByteArray(sizeof(RawAddress)));

    if (!addr.get()) {

      log::error("Failed to get addr for {}", bd_addr);

      return;

    }



    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onExtAudioInStateChanged, (jint)ext_input_id,

                                 (jint)gain_val, (jint)gain_mode, (jboolean)mute, addr.get());

  }



  void OnExtAudioInStatusChanged(const RawAddress& bd_addr, uint8_t ext_input_id,

                                 bluetooth::vc::VolumeInputStatus status) override {

    log::info("");



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) {

      return;

    }



    ScopedLocalRef<jbyteArray> addr(sCallbackEnv.get(),

                                    sCallbackEnv->NewByteArray(sizeof(RawAddress)));

    if (!addr.get()) {

      log::error("Failed to get addr for {}", bd_addr);

      return;

    }



    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onExtAudioInStatusChanged,

                                 (jint)ext_input_id, (jint)status, addr.get());

  }



  void OnExtAudioInTypeChanged(const RawAddress& bd_addr, uint8_t ext_input_id,

                               bluetooth::vc::VolumeInputType type) override {

    log::info("");



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) {

      return;

    }



    ScopedLocalRef<jbyteArray> addr(sCallbackEnv.get(),

                                    sCallbackEnv->NewByteArray(sizeof(RawAddress)));

    if (!addr.get()) {

      log::error("Failed to get addr for {}", bd_addr);

      return;

    }



    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onExtAudioInTypeChanged, (jint)ext_input_id,

                                 (jint)type, addr.get());

  }



  void OnExtAudioInGainPropsChanged(const RawAddress& bd_addr, uint8_t ext_input_id, uint8_t unit,

                                    int8_t min, int8_t max) override {

    log::info("");



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) {

      return;

    }



    ScopedLocalRef<jbyteArray> addr(sCallbackEnv.get(),

                                    sCallbackEnv->NewByteArray(sizeof(RawAddress)));

    if (!addr.get()) {

      log::error("Failed to get addr for {}", bd_addr);

      return;

    }



    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onExtAudioInGainPropsChanged,

                                 (jint)ext_input_id, (jint)unit, (jint)min, (jint)max, addr.get());

  }



  void OnExtAudioInDescriptionChanged(const RawAddress& bd_addr, uint8_t ext_input_id,

                                      std::string descr) override {

    log::info("");



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) {

      return;

    }



    ScopedLocalRef<jbyteArray> addr(sCallbackEnv.get(),

                                    sCallbackEnv->NewByteArray(sizeof(RawAddress)));

    if (!addr.get()) {

      log::error("Failed to get addr for {}", bd_addr);

      return;

    }



    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));

    jstring description = sCallbackEnv->NewStringUTF(descr.c_str());

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onExtAudioInDescriptionChanged,

                                 (jint)ext_input_id, description, addr.get());

  }

};

};





static VolumeControlCallbacksImpl sVolumeControlCallbacks;

static VolumeControlCallbacksImpl sVolumeControlCallbacks;
@@ -514,6 +636,195 @@ static jboolean setExtAudioOutDescriptionNative(JNIEnv* env, jobject /* object * 
  return JNI_TRUE;

  return JNI_TRUE;

}

}





/* Native methods for external audio inputs */

static jboolean getExtAudioInStateNative(JNIEnv* env, jobject /* object */, jbyteArray address,

                                         jint ext_input_id) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->GetExtAudioInState(*tmpraw, ext_input_id);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean getExtAudioInStatusNative(JNIEnv* env, jobject /* object */, jbyteArray address,

                                          jint ext_input_id) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->GetExtAudioInStatus(*tmpraw, ext_input_id);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean getExtAudioInTypeNative(JNIEnv* env, jobject /* object */, jbyteArray address,

                                        jint ext_input_id) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->GetExtAudioInType(*tmpraw, ext_input_id);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean getExtAudioInGainPropsNative(JNIEnv* env, jobject /* object */, jbyteArray address,

                                             jint ext_input_id) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->GetExtAudioInGainProps(*tmpraw, ext_input_id);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean getExtAudioInDescriptionNative(JNIEnv* env, jobject /* object */,

                                               jbyteArray address, jint ext_input_id) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->GetExtAudioInDescription(*tmpraw, ext_input_id);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean setExtAudioInDescriptionNative(JNIEnv* env, jobject /* object */,

                                               jbyteArray address, jint ext_input_id,

                                               jstring descr) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  std::string description;

  if (descr != nullptr) {

    const char* value = env->GetStringUTFChars(descr, nullptr);

    description = std::string(value);

    env->ReleaseStringUTFChars(descr, value);

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->SetExtAudioInDescription(*tmpraw, ext_input_id, description);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean setExtAudioInGainValueNative(JNIEnv* env, jobject /* object */, jbyteArray address,

                                             jint ext_input_id, jint gain_val) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->SetExtAudioInGainValue(*tmpraw, ext_input_id, gain_val);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean setExtAudioInGainModeNative(JNIEnv* env, jobject /* object */, jbyteArray address,

                                            jint ext_input_id, jboolean mode_auto) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->SetExtAudioInGainMode(*tmpraw, ext_input_id, mode_auto);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



static jboolean setExtAudioInGainMuteNative(JNIEnv* env, jobject /* object */, jbyteArray address,

                                            jint ext_input_id, jboolean mute) {

  log::info("");

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sVolumeControlInterface) {

    return JNI_FALSE;

  }



  jbyte* addr = env->GetByteArrayElements(address, nullptr);

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sVolumeControlInterface->SetExtAudioInGainMute(*tmpraw, ext_input_id, mute);

  env->ReleaseByteArrayElements(address, addr, 0);

  return JNI_TRUE;

}



int register_com_android_bluetooth_vc(JNIEnv* env) {

int register_com_android_bluetooth_vc(JNIEnv* env) {

  const JNINativeMethod methods[] = {

  const JNINativeMethod methods[] = {

          {"initNative", "()V", reinterpret_cast<void*>(initNative)},

          {"initNative", "()V", reinterpret_cast<void*>(initNative)},
@@ -540,6 +851,22 @@ int register_com_android_bluetooth_vc(JNIEnv* env) { 
           reinterpret_cast<void*>(getExtAudioOutDescriptionNative)},

           reinterpret_cast<void*>(getExtAudioOutDescriptionNative)},

          {"setExtAudioOutDescriptionNative", "([BILjava/lang/String;)Z",

          {"setExtAudioOutDescriptionNative", "([BILjava/lang/String;)Z",

           reinterpret_cast<void*>(setExtAudioOutDescriptionNative)},

           reinterpret_cast<void*>(setExtAudioOutDescriptionNative)},

          {"getExtAudioInStateNative", "([BI)Z", reinterpret_cast<void*>(getExtAudioInStateNative)},

          {"getExtAudioInStatusNative", "([BI)Z",

           reinterpret_cast<void*>(getExtAudioInStatusNative)},

          {"getExtAudioInTypeNative", "([BI)Z", reinterpret_cast<void*>(getExtAudioInTypeNative)},

          {"getExtAudioInGainPropsNative", "([BI)Z",

           reinterpret_cast<void*>(getExtAudioInGainPropsNative)},

          {"getExtAudioInDescriptionNative", "([BI)Z",

           reinterpret_cast<void*>(getExtAudioInDescriptionNative)},

          {"setExtAudioInDescriptionNative", "([BILjava/lang/String;)Z",

           reinterpret_cast<void*>(setExtAudioInDescriptionNative)},

          {"setExtAudioInGainValueNative", "([BII)Z",

           reinterpret_cast<void*>(setExtAudioInGainValueNative)},

          {"setExtAudioInGainModeNative", "([BIZ)Z",

           reinterpret_cast<void*>(setExtAudioInGainModeNative)},

          {"setExtAudioInGainMuteNative", "([BIZ)Z",

           reinterpret_cast<void*>(setExtAudioInGainMuteNative)},

  };

  };

  const int result = REGISTER_NATIVE_METHODS(

  const int result = REGISTER_NATIVE_METHODS(

          env, "com/android/bluetooth/vc/VolumeControlNativeInterface", methods);

          env, "com/android/bluetooth/vc/VolumeControlNativeInterface", methods);
@@ -551,11 +878,17 @@ int register_com_android_bluetooth_vc(JNIEnv* env) { 
          {"onConnectionStateChanged", "(I[B)V", &method_onConnectionStateChanged},

          {"onConnectionStateChanged", "(I[B)V", &method_onConnectionStateChanged},

          {"onVolumeStateChanged", "(IZI[BZ)V", &method_onVolumeStateChanged},

          {"onVolumeStateChanged", "(IZI[BZ)V", &method_onVolumeStateChanged},

          {"onGroupVolumeStateChanged", "(IZIZ)V", &method_onGroupVolumeStateChanged},

          {"onGroupVolumeStateChanged", "(IZIZ)V", &method_onGroupVolumeStateChanged},

          {"onDeviceAvailable", "(I[B)V", &method_onDeviceAvailable},

          {"onDeviceAvailable", "(II[B)V", &method_onDeviceAvailable},

          {"onExtAudioOutVolumeOffsetChanged", "(II[B)V", &method_onExtAudioOutVolumeOffsetChanged},

          {"onExtAudioOutVolumeOffsetChanged", "(II[B)V", &method_onExtAudioOutVolumeOffsetChanged},

          {"onExtAudioOutLocationChanged", "(II[B)V", &method_onExtAudioOutLocationChanged},

          {"onExtAudioOutLocationChanged", "(II[B)V", &method_onExtAudioOutLocationChanged},

          {"onExtAudioOutDescriptionChanged", "(ILjava/lang/String;[B)V",

          {"onExtAudioOutDescriptionChanged", "(ILjava/lang/String;[B)V",

           &method_onExtAudioOutDescriptionChanged},

           &method_onExtAudioOutDescriptionChanged},

          {"onExtAudioInStateChanged", "(IIIZ[B)V", &method_onExtAudioInStateChanged},

          {"onExtAudioInStatusChanged", "(II[B)V", &method_onExtAudioInStatusChanged},

          {"onExtAudioInTypeChanged", "(II[B)V", &method_onExtAudioInTypeChanged},

          {"onExtAudioInGainPropsChanged", "(IIII[B)V", &method_onExtAudioInGainPropsChanged},

          {"onExtAudioInDescriptionChanged", "(ILjava/lang/String;[B)V",

           &method_onExtAudioInDescriptionChanged},

  };

  };

  GET_JAVA_METHODS(env, "com/android/bluetooth/vc/VolumeControlNativeInterface", javaMethods);

  GET_JAVA_METHODS(env, "com/android/bluetooth/vc/VolumeControlNativeInterface", javaMethods);

android/app/src/com/android/bluetooth/Utils.java

+111 −84

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+4 −8
Original line number Original line Diff line number Diff line
@@ -100,6 +100,7 @@ import java.util.Optional; 
import java.util.PriorityQueue;

import java.util.PriorityQueue;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentHashMap;

import java.util.stream.Collectors;





/** Broadcast Assistant Scan Service */

/** Broadcast Assistant Scan Service */

public class BassClientService extends ProfileService {

public class BassClientService extends ProfileService {
@@ -3059,14 +3060,9 @@ public class BassClientService extends ProfileService { 
                log("stateMachine is null");

                log("stateMachine is null");

                return Collections.emptyList();

                return Collections.emptyList();

            }

            }

            List<BluetoothLeBroadcastReceiveState> recvStates =

            return stateMachine.getAllSources().stream()

                    new ArrayList<BluetoothLeBroadcastReceiveState>();

                    .filter(rs -> !isEmptyBluetoothDevice(rs.getSourceDevice()))

            for (BluetoothLeBroadcastReceiveState rs : stateMachine.getAllSources()) {

                    .collect(Collectors.toList());

                if (!isEmptyBluetoothDevice(rs.getSourceDevice())) {

                    recvStates.add(rs);

                }

            }

            return recvStates;

        }

        }

    }

    }