Snap for 11944020 from 53a9a09a6589ec1d94dac432ceccb65acc35f6a5 to 24Q3-release (67d9438e) · Commits · e / os / android_hardware_interfaces

automotive/evs/aidl/impl/default/resources/evs_mock_configuration.xml

+24 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,30 @@
		<stream id='0' width='640' height='360' format='RGBA_8888' framerate='30'/>
		</caps>

		<!-- list of parameters -->
		<characteristics>
		<!-- Camera intrinsic calibration matrix. See
		https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#LENS_INTRINSIC_CALIBRATION
		-->
		<parameter
		name='LENS_INTRINSIC_CALIBRATION'
		type='float'
		size='5'
		value='0.0,0.0,0.0,0.0,0.0'
		/>
		</characteristics>
		</device>
		<device id='/dev/video11' position='front'>
		<caps>
		<!-- list of supported controls -->
		<supported_controls>
		<control name='BRIGHTNESS' min='0' max='255'/>
		<control name='CONTRAST' min='0' max='255'/>
		</supported_controls>

		<stream id='0' width='640' height='360' format='RGBA_8888' framerate='30'/>
		</caps>

		<!-- list of parameters -->
		<characteristics>
		<!-- Camera intrinsic calibration matrix. See

bluetooth/aidl/default/net_bluetooth_mgmt.cpp

+16 −6

Original line number	Diff line number	Diff line
		@@ -161,6 +161,16 @@ int NetBluetoothMgmt::waitHciDev(int hci_interface) {
		struct mgmt_ev_read_index_list* data =
		(struct mgmt_ev_read_index_list*)ev.data;

		// Prefer the exact hci_interface
		for (int i = 0; i < data->num_controllers; i++) {
		if (data->index[i] == hci_interface) {
		ALOGI("hci interface %d found", data->index[i]);
		ret = data->index[i];
		goto end;
		}
		}

		// Accept a larger one if we can't find the exact one
		for (int i = 0; i < data->num_controllers; i++) {
		if (data->index[i] >= hci_interface) {
		ALOGI("hci interface %d found", data->index[i]);
		@@ -173,7 +183,7 @@ int NetBluetoothMgmt::waitHciDev(int hci_interface) {
		// Received [Index Added] event.
		if (ev.opcode == MGMT_EV_INDEX_ADDED && ev.index == hci_interface) {
		ALOGI("hci interface %d added", hci_interface);
		ret = 0;
		ret = hci_interface;
		goto end;
		}
		}
		@@ -253,9 +263,9 @@ int NetBluetoothMgmt::openHci(int hci_interface) {
		rfkill(1);

		// Wait for the HCI interface to complete initialization or to come online.
		hci_interface = waitHciDev(hci_interface);
		if (hci_interface < 0) {
		ALOGE("hci interface not found");
		int hci = waitHciDev(hci_interface);
		if (hci < 0) {
		ALOGE("hci interface %d not found", hci_interface);
		return -1;
		}

		@@ -268,7 +278,7 @@ int NetBluetoothMgmt::openHci(int hci_interface) {

		struct sockaddr_hci hci_addr = {
		.hci_family = AF_BLUETOOTH,
		.hci_dev = static_cast<uint16_t>(hci_interface),
		.hci_dev = static_cast<uint16_t>(hci),
		.hci_channel = HCI_CHANNEL_USER,
		};

		@@ -279,7 +289,7 @@ int NetBluetoothMgmt::openHci(int hci_interface) {
		return -1;
		}

		ALOGI("hci interface %d ready", hci_interface);
		ALOGI("hci interface %d ready", hci);
		bt_fd_ = fd;
		return fd;
		}

bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp

+1 −14

Original line number	Diff line number	Diff line
		@@ -4374,19 +4374,6 @@ TEST_P(BluetoothAudioProviderLeAudioBroadcastHardwareAidl,
		ASSERT_NE(configuration.numBis, 0);
		ASSERT_FALSE(configuration.subgroupsConfigurations.empty());
		VerifyBroadcastConfiguration(one_subgroup_requirement, configuration);

		IBluetoothAudioProvider::LeAudioBroadcastConfigurationRequirement
		two_subgroup_requirement =
		GetBroadcastRequirement(true /* standard/, true / high */);

		// Check empty capability for source direction
		aidl_retval = audio_provider_->getLeAudioBroadcastConfiguration(
		empty_capability, two_subgroup_requirement, &configuration);

		ASSERT_TRUE(aidl_retval.isOk());
		ASSERT_NE(configuration.numBis, 0);
		ASSERT_FALSE(configuration.subgroupsConfigurations.empty());
		VerifyBroadcastConfiguration(two_subgroup_requirement, configuration);
		}

		TEST_P(BluetoothAudioProviderLeAudioBroadcastHardwareAidl,
		@@ -4405,7 +4392,7 @@ TEST_P(BluetoothAudioProviderLeAudioBroadcastHardwareAidl,

		IBluetoothAudioProvider::LeAudioBroadcastConfigurationRequirement
		requirement =
		GetBroadcastRequirement(true /* standard/, true / high */);
		GetBroadcastRequirement(true /* standard/, false / high */);

		IBluetoothAudioProvider::LeAudioBroadcastConfigurationSetting configuration;

gnss/aidl/default/Gnss.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -162,12 +162,13 @@ ScopedAStatus Gnss::close() {
		return ScopedAStatus::ok();
		}

		void Gnss::reportLocation(const GnssLocation& location) const {
		void Gnss::reportLocation(const GnssLocation& location) {
		std::unique_lock<std::mutex> lock(mMutex);
		if (sGnssCallback == nullptr) {
		ALOGE("%s: GnssCallback is null.", __func__);
		return;
		}
		mLastLocation = std::make_shared<GnssLocation>(location);
		auto status = sGnssCallback->gnssLocationCb(location);
		if (!status.isOk()) {
		ALOGE("%s: Unable to invoke gnssLocationCb", __func__);
		@@ -359,7 +360,6 @@ ScopedAStatus Gnss::getExtensionGnssNavigationMessage(

		ndk::ScopedAStatus Gnss::getExtensionGnssDebug(std::shared_ptr<IGnssDebug>* iGnssDebug) {
		ALOGD("Gnss::getExtensionGnssDebug");

		*iGnssDebug = SharedRefBase::make<GnssDebug>();
		return ndk::ScopedAStatus::ok();
		}
		@@ -398,4 +398,8 @@ void Gnss::setGnssMeasurementInterval(const long intervalMs) {
		mGnssMeasurementIntervalMs = intervalMs;
		}

		std::shared_ptr<GnssLocation> Gnss::getLastLocation() const {
		return mLastLocation;
		}

		} // namespace aidl::android::hardware::gnss

gnss/aidl/default/Gnss.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -87,18 +87,19 @@ class Gnss : public BnGnss {
		void reportSvStatus() const;
		void setGnssMeasurementEnabled(const bool enabled);
		void setGnssMeasurementInterval(const long intervalMs);
		std::shared_ptr<GnssLocation> getLastLocation() const;
		std::shared_ptr<GnssConfiguration> mGnssConfiguration;
		std::shared_ptr<GnssPowerIndication> mGnssPowerIndication;
		std::shared_ptr<GnssMeasurementInterface> mGnssMeasurementInterface;

		private:
		void reportLocation(const GnssLocation&) const;
		void reportLocation(const GnssLocation&);
		void reportSvStatus(const std::vector<IGnssCallback::GnssSvInfo>& svInfoList) const;
		void reportGnssStatusValue(const IGnssCallback::GnssStatusValue gnssStatusValue) const;
		void reportNmea() const;
		std::vector<IGnssCallback::GnssSvInfo> filterBlocklistedSatellites(
		std::vector<IGnssCallback::GnssSvInfo> gnssSvInfoList) const;
		void reportGnssStatusValue(const IGnssCallback::GnssStatusValue gnssStatusValue) const;
		std::unique_ptr<GnssLocation> getLocationFromHW();
		void reportNmea() const;

		static std::shared_ptr<IGnssCallback> sGnssCallback;

		@@ -109,6 +110,7 @@ class Gnss : public BnGnss {
		std::atomic<bool> mIsNmeaActive;
		std::atomic<bool> mFirstFixReceived;
		std::atomic<bool> mGnssMeasurementEnabled;
		std::shared_ptr<GnssLocation> mLastLocation;
		std::thread mThread;
		::android::hardware::gnss::common::ThreadBlocker mThreadBlocker;