Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61cd2a6c authored Mar 07, 2023 by Steven Moreland Committed by Automerger Merge Worker Mar 07, 2023

Merge "binderRpcTest: named normal modes" am: 54916ea5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2471758

Change-Id: I309946f30618487a0bc7f1b9dcfb1ccd367dbf8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 9384d621 54916ea5

libs/binder/tests/binderRpcTest.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -237,9 +237,13 @@ std::string BinderRpc::PrintParamInfo(const testing::TestParamInfo<ParamType>& i
	std::to_string(clientVersion) + "_serverV" + std::to_string(serverVersion);		std::to_string(clientVersion) + "_serverV" + std::to_string(serverVersion);
	if (singleThreaded) {		if (singleThreaded) {
	ret += "_single_threaded";		ret += "_single_threaded";
			} else {
			ret += "_multi_threaded";
	}		}
	if (noKernel) {		if (noKernel) {
	ret += "_no_kernel";		ret += "_no_kernel";
			} else {
			ret += "_with_kernel";
	}		}
	return ret;		return ret;
	}		}

libs/binder/tests/binderRpcTestTrusty.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,9 +45,13 @@ std::string BinderRpc::PrintParamInfo(const testing::TestParamInfo<ParamType>& i
	std::to_string(serverVersion);		std::to_string(serverVersion);
	if (singleThreaded) {		if (singleThreaded) {
	ret += "_single_threaded";		ret += "_single_threaded";
			} else {
			ret += "_multi_threaded";
	}		}
	if (noKernel) {		if (noKernel) {
	ret += "_no_kernel";		ret += "_no_kernel";
			} else {
			ret += "_with_kernel";
	}		}
	return ret;		return ret;
	}		}