Snap for 7447836 from a8c42cf0a1750a1146fe4f816f78fc2e476e527d to sc-release (ee0013e9) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.0/vts/functional/VtsHalAutomotiveVehicleV2_0TargetTest.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,7 @@ TEST_P(VehicleHalHidlTest, subscribeInvalidProp) {
		ASSERT_NE(StatusCode::OK, mVehicle->subscribe(cb, options));
		}

		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VehicleHalHidlTest);
		INSTANTIATE_TEST_SUITE_P(
		PerInstance, VehicleHalHidlTest,
		testing::ValuesIn(android::hardware::getAllHalInstanceNames(IVehicle::descriptor)),

+14 −9

Original line number	Diff line number	Diff line
		@@ -73,24 +73,29 @@ TEST(WorkerThreadTest, TasksExecuteInOrder) {
		constexpr int NUM_TASKS = 10000;
		WorkerThread worker(NUM_TASKS);

		std::mutex mut;
		std::condition_variable cv;
		bool finished = false;
		std::vector<int> results;

		for (int i = 0; i < NUM_TASKS; ++i) {
		worker.schedule(Callable::from([&results, i] {
		worker.schedule(Callable::from([&mut, &results, i] {
		// Delay tasks differently to provoke races.
		std::this_thread::sleep_for(std::chrono::nanoseconds(100 - i % 100));
		// Unguarded write to results to provoke races.
		auto lock = std::lock_guard(mut);
		results.push_back(i);
		}));
		}

		std::promise<void> promise;
		auto future = promise.get_future();

		// Schedule a special task to signal when all of the tasks are finished.
		worker.schedule(
		Callable::from([promise = std::move(promise)]() mutable { promise.set_value(); }));
		future.wait();
		worker.schedule(Callable::from([&mut, &cv, &finished] {
		auto lock = std::lock_guard(mut);
		finished = true;
		cv.notify_one();
		}));

		auto lock = std::unique_lock(mut);
		cv.wait(lock, [&finished] { return finished; });
		ASSERT_EQ(results.size(), NUM_TASKS);
		EXPECT_TRUE(std::is_sorted(results.begin(), results.end()));
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -825,6 +825,9 @@ a7d74d7e7e0b1e3b739f233b7776bf01e868856a536f5cdac0f307e9c2850e64 android.hardwar
		b4cbc1f2d38787f2ad069a8e4d10c0896287531a2596f0de0283e390b0ecf05d android.hardware.audio.effect@7.0::IVirtualizerEffect
		2b5681e1ea6a2db0dc1e84edb96d3de2f7daf306046543e7956be76dcb8f20fb android.hardware.audio.effect@7.0::IVisualizerEffect
		fa1e2d78e66fd662de93cb479ffd55947fe54f51cb53915814b3d3e3036c86a5 android.hardware.audio.effect@7.0::types
		e3865e74cb1a6e6afd38c7aa84115cb109ce47b972132de5242bc3838d2771f6 android.hardware.automotive.vehicle@2.0::types
		b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle
		7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback
		b525e91d886379c13588f4975bb04d625d46e1f41b4453792c4b2db1e7ff4340 android.hardware.biometrics.fingerprint@2.3::IBiometricsFingerprint
		4baf8e0eca4aa896cc9ceb7bb676aaf4fa21372ef8b49eed68eced1221c3dc0d android.hardware.bluetooth.audio@2.1::IBluetoothAudioProvider
		d417a9212c8f96e3a06a2f221c8c5756c765355b2b81de2b2a65d4c9eee85401 android.hardware.bluetooth.audio@2.1::IBluetoothAudioProvidersFactory

+13 −2

Original line number	Diff line number	Diff line
		@@ -561,17 +561,28 @@ void GraphicsComposerHidlTest::Test_setActiveConfigWithConstraints(const TestPar
		setActiveConfig(display, config1);
		sendRefreshFrame(display, nullptr);

		int32_t vsyncPeriod1 = mComposerClient->getDisplayAttribute_2_4(
		const auto vsyncPeriod1 = mComposerClient->getDisplayAttribute_2_4(
		display.get(), config1,
		IComposerClient::IComposerClient::Attribute::VSYNC_PERIOD);
		int32_t vsyncPeriod2 = mComposerClient->getDisplayAttribute_2_4(
		const auto configGroup1 = mComposerClient->getDisplayAttribute_2_4(
		display.get(), config1,
		IComposerClient::IComposerClient::Attribute::CONFIG_GROUP);
		const auto vsyncPeriod2 = mComposerClient->getDisplayAttribute_2_4(
		display.get(), config2,
		IComposerClient::IComposerClient::Attribute::VSYNC_PERIOD);
		const auto configGroup2 = mComposerClient->getDisplayAttribute_2_4(
		display.get(), config2,
		IComposerClient::IComposerClient::Attribute::CONFIG_GROUP);

		if (vsyncPeriod1 == vsyncPeriod2) {
		return; // continue
		}

		// We don't allow delayed change when changing config groups
		if (params.delayForChange > 0 && configGroup1 != configGroup2) {
		return; // continue
		}

		VsyncPeriodChangeTimeline timeline;
		IComposerClient::VsyncPeriodChangeConstraints constraints = {
		.desiredTimeNanos = systemTime() + params.delayForChange,

+4 −4

Original line number	Diff line number	Diff line
		@@ -159,18 +159,17 @@ parcelable KeyCreationResult {
		* purpose [1] EXPLICIT SET OF INTEGER OPTIONAL,
		* algorithm [2] EXPLICIT INTEGER OPTIONAL,
		* keySize [3] EXPLICIT INTEGER OPTIONAL,
		* blockMode [4] EXPLICIT SET OF INTEGER OPTIONAL,
		* digest [5] EXPLICIT SET OF INTEGER OPTIONAL,
		* padding [6] EXPLICIT SET OF INTEGER OPTIONAL,
		* callerNonce [7] EXPLICIT NULL OPTIONAL,
		* minMacLength [8] EXPLICIT INTEGER OPTIONAL,
		* ecCurve [10] EXPLICIT INTEGER OPTIONAL,
		* rsaPublicExponent [200] EXPLICIT INTEGER OPTIONAL,
		* mgfDigest [203] EXPLICIT SET OF INTEGER OPTIONAL,
		* rollbackResistance [303] EXPLICIT NULL OPTIONAL,
		* earlyBootOnly [305] EXPLICIT NULL OPTIONAL,
		* activeDateTime [400] EXPLICIT INTEGER OPTIONAL,
		* originationExpireDateTime [401] EXPLICIT INTEGER OPTIONAL,
		* usageExpireDateTime [402] EXPLICIT INTEGER OPTIONAL,
		* userSecureId [502] EXPLICIT INTEGER OPTIONAL,
		* usageCountLimit [405] EXPLICIT INTEGER OPTIONAL,
		* noAuthRequired [503] EXPLICIT NULL OPTIONAL,
		* userAuthType [504] EXPLICIT INTEGER OPTIONAL,
		* authTimeout [505] EXPLICIT INTEGER OPTIONAL,
		@@ -194,6 +193,7 @@ parcelable KeyCreationResult {
		* attestationIdModel [717] EXPLICIT OCTET_STRING OPTIONAL,
		* vendorPatchLevel [718] EXPLICIT INTEGER OPTIONAL,
		* bootPatchLevel [719] EXPLICIT INTEGER OPTIONAL,
		* deviceUniqueAttestation [720] EXPLICIT NULL OPTIONAL,
		* }
		*/
		Certificate[] certificateChain;