Merge "Remove binder threadpool init from puller tests" into rvc-dev am: 5957853da6 (18600913) · Commits · e / os / android_frameworks_base

apex/statsd/tests/libstatspull/jni/stats_pull_helper.cpp

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,6 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	#include <android/binder_process.h>
	#include <jni.h>		#include <jni.h>
	#include <log/log.h>		#include <log/log.h>
	#include <stats_event.h>		#include <stats_event.h>
	@@ -32,17 +31,6 @@ static int64_t sLatencyMillis;
	static int32_t sAtomsPerPull;		static int32_t sAtomsPerPull;
	static int32_t sNumPulls = 0;		static int32_t sNumPulls = 0;

	static bool initialized = false;

	static void init() {
	if (!initialized) {
	initialized = true;
	// Set up the binder
	ABinderProcess_setThreadPoolMaxThreadCount(9);
	ABinderProcess_startThreadPool();
	}
	}

	static AStatsManager_PullAtomCallbackReturn pullAtomCallback(int32_t atomTag, AStatsEventList* data,		static AStatsManager_PullAtomCallbackReturn pullAtomCallback(int32_t atomTag, AStatsEventList* data,
	void* /cookie/) {		void* /cookie/) {
	sNumPulls++;		sNumPulls++;
	@@ -62,7 +50,6 @@ Java_com_android_internal_os_statsd_libstats_LibStatsPullTests_registerStatsPull
	JNIEnv* /env/, jobject /* this */, jint atomTag, jlong timeoutNs, jlong coolDownNs,		JNIEnv* /env/, jobject /* this */, jint atomTag, jlong timeoutNs, jlong coolDownNs,
	jint pullRetVal, jlong latencyMillis, int atomsPerPull)		jint pullRetVal, jlong latencyMillis, int atomsPerPull)
	{		{
	init();
	sAtomTag = atomTag;		sAtomTag = atomTag;
	sPullReturnVal = pullRetVal;		sPullReturnVal = pullRetVal;
	sLatencyMillis = latencyMillis;		sLatencyMillis = latencyMillis;