Snap for 11760402 from 31fdd9bb303b9af6273893e9a4b74b8560183ee8 to 24Q3-release (893c8667) · Commits · e / os / android_hardware_interfaces

automotive/remoteaccess/test_grpc_server/impl/src/TestWakeupClientServiceImpl.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,8 @@ void ServiceImpl::loop() {
		Looper::setForThread(mLooper);

		while (true) {
		mLooper->pollAll(/timeoutMillis=/-1);
		// Don't use pollAll since it might swallow wake.
		mLooper->pollOnce(/timeoutMillis=/-1);
		if (mServerStopped) {
		return;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,9 @@ class TestWakeupClientServiceImplUnitTest : public ::testing::Test {
		public:
		virtual void SetUp() override {
		int selectedPort = 0;
		mServerStarted = false;
		mService.reset();
		mServer.reset();
		mServerThread = std::thread([this, &selectedPort] {
		mService = std::make_unique<MyTestWakeupClientServiceImpl>();
		ServerBuilder builder;

+6 −6

Original line number	Diff line number	Diff line
		@@ -603,6 +603,7 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, subscribe_enableVurIfSupported) {
		<< "skip testing";
		}

		// Subscribe to PERF_VEHICLE_SPEED using the max sample rate.
		auto client = mVhalClient->getSubscriptionClient(mCallback);
		ASSERT_NE(client, nullptr) << "Failed to get subscription client";
		SubscribeOptionsBuilder builder(propId);
		@@ -616,18 +617,17 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, subscribe_enableVurIfSupported) {
		", error: %s",
		propId, result.error().message().c_str());

		ASSERT_TRUE(mCallback->waitForExpectedEvents(propId, 1, std::chrono::seconds(2)))
		<< "Must get at least 1 events within 2 seconds after subscription for rate: "
		<< maxSampleRate;

		// Sleep for 1 seconds to wait for more possible events to arrive.
		std::this_thread::sleep_for(std::chrono::seconds(1));

		client->unsubscribe({propId});

		auto events = mCallback->getEvents(propId);
		if (events.size() == 1) {
		// We only received one event, the value is not changing so nothing to check here.
		if (events.size() <= 1) {
		// We received 0 or 1 event, the value is not changing so nothing to check here.
		// If all VHAL clients are subscribing to PERF_VEHICLE_SPEED with VUR on, then we
		// will receive 0 event. If there are other VHAL clients subscribing to PERF_VEHICLE_SPEED
		// with VUR off, then we will receive 1 event which is the initial value.
		return;
		}

+4 −2

Original line number	Diff line number	Diff line
		ilyamaty@google.com
		# Bug component: 879035

		include platform/frameworks/base:/services/core/java/com/android/server/biometrics/OWNERS

		jeffpu@google.com
		jbolinger@google.com
		joshmccloskey@google.com
		diyab@google.com
		austindelgado@google.com
		spdonghao@google.com
		wenhuiy@google.com