Snap for 10132053 from 2047ab0aaeb14f9724af547b54c126c730a14c73 to udc-release (4774f0b7) · Commits · e / os / android_hardware_interfaces

automotive/remoteaccess/hal/default/src/RemoteAccessService.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -65,8 +65,7 @@ constexpr char COMMAND_INJECT_TASK[] = "--inject-task";
		constexpr char COMMAND_INJECT_TASK_NEXT_REBOOT[] = "--inject-task-next-reboot";
		constexpr char COMMAND_STATUS[] = "--status";

		constexpr char DEBUG_TASK_FOLDER[] = "/data/local/tests";
		constexpr char DEBUG_TASK_FILE[] = "/data/local/tests/debugTask";
		constexpr char DEBUG_TASK_FILE[] = "/data/vendor/remoteaccess/debugTask";

		std::vector<uint8_t> stringToBytes(std::string_view s) {
		const char* data = s.data();

bluetooth/aidl/TEST_MAPPING

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		"options": [
		{
		// TODO(b/275847929)
		"exclude-filter": "VtsHalBluetoothTargetTest.PerInstance/BluetoothAidlTest#Cdd_C_12_1_Bluetooth5Requirements/0_android_hardware_bluetooth_IBluetoothHci_default"
		"exclude-filter": "VtsHalBluetoothTargetTest.PerInstance/BluetoothAidlTest#Vsr_Bluetooth5Requirements/0_android_hardware_bluetooth_IBluetoothHci_default"
		}
		]
		}
		@@ -16,7 +16,7 @@
		"options": [
		{
		// TODO(b/275847929)
		"exclude-filter": "VtsHalBluetoothTargetTest.PerInstance/BluetoothAidlTest#Cdd_C_12_1_Bluetooth5Requirements/0_android_hardware_bluetooth_IBluetoothHci_default"
		"exclude-filter": "VtsHalBluetoothTargetTest.PerInstance/BluetoothAidlTest#Vsr_Bluetooth5Requirements/0_android_hardware_bluetooth_IBluetoothHci_default"
		}
		]
		}

bluetooth/aidl/vts/VtsHalBluetoothTargetTest.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -951,7 +951,7 @@ TEST_P(BluetoothAidlTest, CallInitializeTwice) {
		ASSERT_EQ(status, std::future_status::ready);
		}

		TEST_P(BluetoothAidlTest, Cdd_C_12_1_Bluetooth5Requirements) {
		TEST_P(BluetoothAidlTest, Vsr_Bluetooth5Requirements) {
		std::vector<uint8_t> version_event;
		send_and_wait_for_cmd_complete(ReadLocalVersionInformationBuilder::Create(),
		version_event);

wifi/offload/1.0/Android.bp

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen -Landroidbp.

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "hardware_interfaces_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		hidl_interface {
		name: "android.hardware.wifi.offload@1.0",
		root: "android.hardware",
		srcs: [
		"types.hal",
		"IOffload.hal",
		"IOffloadCallback.hal",
		],
		interfaces: [
		"android.hidl.base@1.0",
		],
		gen_java: false,
		}

wifi/offload/1.0/IOffload.hal

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		/*
		* Copyright 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.wifi.offload@1.0;

		import IOffloadCallback;

		interface IOffload {
		/**
		* Configure the offload module to perform scans and filter results
		* Scans must not be triggered due to configuration of the module.
		*
		* @param ScanParam paramters for scanning
		* @param ScanFilter settings to filter scan result
		* @return OffloadStatus indicating status of operation provided by this API
		* If OffloadStatusCode::OK is returned, the operation was successful
		* If OffloadStatusCode::NO_CONNECTION is returned, connection to the hardware is lost
		* If OffloadStatusCode::ERROR is returned, requested operation could not be completed
		*/
		@entry
		@callflow(next={"setEventCallback", "subscribeScanResults"})
		configureScans(ScanParam param, ScanFilter filter) generates (OffloadStatus status);

		/**
		* Get scan statistics
		*
		* @return OffloadStatus indicating status of operation provided by this API
		* @return ScanStats statistics of scans performed
		* If OffloadStatusCode::OK is returned, the operation was successful
		* If OffloadStatusCode::NO_CONNECTION is returned, connection to the hardware is lost
		* If OffloadStatusCode::ERROR is returned, requested operation could not be completed
		* If OffloadStatusCode::TIMEOUT is returned, time out waiting for the requested data
		*/
		@exit
		@callflow(next={"subscribeScanResults", "unsubscribeScanResults", "getScanStats"})
		getScanStats() generates (OffloadStatus status, ScanStats scanStats);

		/**
		* Subscribe to asynchronous scan events sent by offload module. This enables
		* offload scans to be performed as per scan parameters, filtering the scan
		* results based on configured scan filter and delivering the results after
		* at least delayMs milliseconds from this call. If the client is already
		* subscribed to the scan results, a call to this API must be a no-op.
		*
		* @param delayMs an integer expressing the minimum delay in mS after
		* subscribing when scan results must be delivered to the client
		* @return OffloadStatus indicating status of operation provided by this API
		* If OffloadStatusCode::OK is returned, the operation was successful
		* If OffloadStatusCode::NO_CONNECTION is returned, connection to the hardware is lost
		* If OffloadStatusCode::ERROR is returned, requested operation could not be completed
		*/
		@callflow(next={"unsubscribeScanResults", "getScanStats"})
		subscribeScanResults(uint32_t delayMs) generates (OffloadStatus status);

		/**
		* Unsubscribe to scan events sent by the offload module, hence disabling scans.
		* If the client is already unsubscribed, a call to this API will be a no-op.
		*/
		@exit
		@callflow(next={"*"})
		unsubscribeScanResults();

		/**
		* Setup the HIDL interface for reporting asynchronous scan events. A maximum
		* of one callback interface is supported. Only one callback must be registered
		* at any given time. If two consecutive calls are made with different callback
		* interface objects, the latest one must be used to deliver events to client.
		*
		* @param cb An instance of the \|IOffloadCallback\| HIDL interface object
		*/
		@entry
		@callflow(next={"subscribeScanStats", "configureScans"})
		setEventCallback(IOffloadCallback cb);
		};