Merge "Merge "Merge "Revert "Revert "Make AndroidRuntime only start the... (29aa5c62) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -766,17 +766,16 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv, bool zygote)

	/*		/*
	* Enable debugging only for apps forked from zygote.		* Enable debugging only for apps forked from zygote.
	* Set suspend=y to pause during VM init and use android ADB transport.
	*/		*/
	if (zygote) {		if (zygote) {
			// Set the JDWP provider and required arguments. By default let the runtime choose how JDWP is
			// implemented. When this is not set the runtime defaults to not allowing JDWP.
	addOption("-XjdwpOptions:suspend=n,server=y");		addOption("-XjdwpOptions:suspend=n,server=y");
	}

	// Set the JDWP provider. By default let the runtime choose.
	parseRuntimeOption("dalvik.vm.jdwp-provider",		parseRuntimeOption("dalvik.vm.jdwp-provider",
	jdwpProviderBuf,		jdwpProviderBuf,
	"-XjdwpProvider:",		"-XjdwpProvider:",
	"default");		"default");
			}

	parseRuntimeOption("dalvik.vm.lockprof.threshold",		parseRuntimeOption("dalvik.vm.lockprof.threshold",
	lockProfThresholdBuf,		lockProfThresholdBuf,