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

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

Snap for 11772614 from c8d5e536 to 24Q3-release

Change-Id: I64732289e2f2eee15950800d6042470fbab6d38b
parents 0dee7266 c8d5e536
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,37 @@ TEST_P(BluetoothAidlTest, Vsr_Bluetooth4_2Requirements) {

}

/**
 * VSR-5.3.14-012 MUST support at least eight LE concurrent connections with
 *                three in peripheral role.
 */
// @VsrTest = 5.3.14-012
TEST_P(BluetoothAidlTest, Vsr_BlE_Connection_Requirement) {
  std::vector<uint8_t> version_event;
  send_and_wait_for_cmd_complete(ReadLocalVersionInformationBuilder::Create(),
                                 version_event);
  auto version_view = ReadLocalVersionInformationCompleteView::Create(
      CommandCompleteView::Create(EventView::Create(PacketView<true>(
          std::make_shared<std::vector<uint8_t>>(version_event)))));
  ASSERT_TRUE(version_view.IsValid());
  ASSERT_EQ(::bluetooth::hci::ErrorCode::SUCCESS, version_view.GetStatus());
  auto version = version_view.GetLocalVersionInformation();
  if (version.hci_version_ < ::bluetooth::hci::HciVersion::V_5_0) {
    // This test does not apply to controllers below 5.0
    return;
  };

  int max_connections = ::android::base::GetIntProperty(
      "bluetooth.core.le.max_number_of_concurrent_connections", -1);
  if (max_connections == -1) {
    // With the property not set the default minimum of 8 will be used
    ALOGI("Max number of LE concurrent connections isn't set");
    return;
  }
  ALOGI("Max number of LE concurrent connections = %d", max_connections);
  ASSERT_GE(max_connections, 8);
}

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BluetoothAidlTest);
INSTANTIATE_TEST_SUITE_P(PerInstance, BluetoothAidlTest,
                         testing::ValuesIn(android::getAidlHalInstanceNames(
+0 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@
#include <aidl/Vintf.h>
#include <aidl/android/hardware/bluetooth/finder/IBluetoothFinder.h>
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android/binder_manager.h>
#include <android/binder_process.h>
#include <binder/IServiceManager.h>
@@ -72,12 +71,6 @@ ScopedAStatus BluetoothFinderTest::getPoweredOffFinderMode(bool* status) {
  return bluetooth_finder->getPoweredOffFinderMode(status);
}

TEST_P(BluetoothFinderTest, PropertyIsSet) {
  ASSERT_EQ(
      android::base::GetProperty("ro.bluetooth.finder.supported", "false"),
      "true");
}

TEST_P(BluetoothFinderTest, SendEidsSingle) {
  ScopedAStatus status = sendEids(1);
  ASSERT_TRUE(status.isOk());
+1 −1
Original line number Diff line number Diff line
@@ -8140,7 +8140,7 @@ void CameraHidlTest::verifyCameraCharacteristics(Status status, const CameraMeta
            ANDROID_LENS_POSE_REFERENCE, &entry);
    if (0 == retcode && entry.count > 0) {
        uint8_t poseReference = entry.data.u8[0];
        ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_UNDEFINED &&
        ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_AUTOMOTIVE &&
                poseReference >= ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA);
    }

+2 −2
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ void CameraAidlTest::verifyCameraCharacteristics(const CameraMetadata& chars) {
    retcode = find_camera_metadata_ro_entry(metadata, ANDROID_LENS_POSE_REFERENCE, &entry);
    if (0 == retcode && entry.count > 0) {
        uint8_t poseReference = entry.data.u8[0];
        ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_UNDEFINED &&
        ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_AUTOMOTIVE &&
                poseReference >= ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA);
    }

+2 −1
Original line number Diff line number Diff line
@@ -1714,7 +1714,8 @@ TEST_P(GnssHalTest, TestAccumulatedDeltaRange) {
 * 2. verify the SvStatus are received at expected interval
 */
TEST_P(GnssHalTest, TestSvStatusIntervals) {
    if (aidl_gnss_hal_->getInterfaceVersion() <= 2) {
    // Only runs on devices launched in Android 15+
    if (aidl_gnss_hal_->getInterfaceVersion() <= 3) {
        return;
    }
    ALOGD("TestSvStatusIntervals");