Snap for 11672362 from 8392bc6c6104a92b3930e30d6d01eb40501081d1 to 24Q3-release (6c0837e4) · Commits · e / os / android_hardware_interfaces

tv/tuner/aidl/vts/functional/FrontendTests.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -353,8 +353,7 @@ void FrontendTests::verifyFrontendStatus(vector<FrontendStatusType> statusTypes,
		break;
		}
		case FrontendStatusType::UEC: {
		ASSERT_TRUE(realStatuses[i].get<FrontendStatus::Tag::uec>() ==
		expectStatuses[i].get<FrontendStatus::Tag::uec>());
		ASSERT_TRUE(realStatuses[i].get<FrontendStatus::Tag::uec>() >= 0);
		break;
		}
		case FrontendStatusType::T2_SYSTEM_ID: {

+1 −7

Original line number	Diff line number	Diff line
		@@ -273,16 +273,10 @@ struct TunerTestingConfigAidlReader1_0 {
		vector<FrontendStatusType> types;
		vector<FrontendStatus> statuses;

		types.push_back(FrontendStatusType::DEMOD_LOCK);
		types.push_back(FrontendStatusType::UEC);
		types.push_back(FrontendStatusType::IS_MISO);

		FrontendStatus status;
		status.set<FrontendStatus::Tag::isDemodLocked>(true);
		statuses.push_back(status);
		status.set<FrontendStatus::Tag::uec>(4);
		statuses.push_back(status);
		status.set<FrontendStatus::Tag::isMiso>(true);
		status.set<FrontendStatus::Tag::uec>(0);
		statuses.push_back(status);

		auto frontends = *hardwareConfig.getFirstFrontends();

+10 −0

Original line number	Diff line number	Diff line
		@@ -525,6 +525,7 @@ bool convertLegacyGscanCapabilitiesToAidl(const legacy_hal::wifi_gscan_capabilit
		return true;
		}

		// Only use to prepare parameters for Gscan.
		legacy_hal::wifi_band convertAidlWifiBandToLegacy(WifiBand band) {
		switch (band) {
		case WifiBand::BAND_UNSPECIFIED:
		@@ -541,6 +542,15 @@ legacy_hal::wifi_band convertAidlWifiBandToLegacy(WifiBand band) {
		return legacy_hal::WIFI_BAND_ABG;
		case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS:
		return legacy_hal::WIFI_BAND_ABG_WITH_DFS;
		case WifiBand::BAND_6GHZ:
		case WifiBand::BAND_60GHZ:
		case WifiBand::BAND_5GHZ_6GHZ:
		case WifiBand::BAND_24GHZ_5GHZ_6GHZ:
		case WifiBand::BAND_24GHZ_5GHZ_6GHZ_60GHZ:
		case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS_6GHZ:
		case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS_6GHZ_60GHZ:
		LOG(INFO) << "WifiBand mapping may be incorrect, since 6GHz is not supported by legacy";
		return legacy_hal::WIFI_BAND_UNSPECIFIED;
		default:
		CHECK(false);
		return {};

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2024 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.

		cc_library_headers {
		name: "wifi_legacy_headers",
		vendor_available: true,
		export_include_dirs: ["include"],

		header_libs: ["libcutils_headers"],
		export_header_lib_headers: ["libcutils_headers"],
		}

		cc_library_shared {
		name: "wifi_legacy",
		vendor_available: true,

		header_libs: [
		"wifi_legacy_headers",
		],
		export_header_lib_headers: ["wifi_legacy_headers"],

		export_include_dirs: ["include"],

		cflags: [
		"-DQEMU_HARDWARE",
		"-Wall",
		"-Werror",
		],
		}

0 → 100644

+430 −0

File added.

Preview size limit exceeded, changes collapsed.