Merge "Move VM feature strings (used by DDMS) into VM." (a93e4591) · Commits · e / os / android_frameworks_base

core/java/android/ddm/DdmHandleHello.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public class DdmHandleHello extends ChunkHandler {
		if (Config.LOGV)
		Log.v("ddm-hello", "Connected!");

		if (true) {
		if (false) {
		/* test spontaneous transmission */
		byte[] data = new byte[] { 0, 1, 2, 3, 4, -4, -3, -2, -1, 127 };
		Chunk testChunk =
		@@ -148,9 +148,7 @@ public class DdmHandleHello extends ChunkHandler {
		private Chunk handleFEAT(Chunk request) {
		// TODO: query the VM to ensure that support for these features
		// is actually compiled in
		final String[] features = {
		"hprof-heap-dump", "method-trace-profiling"
		};
		final String[] features = Debug.getVmFeatureList();

		if (Config.LOGV)
		Log.v("ddm-heap", "Got feature list request");

+11 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,17 @@ public final class Debug
		return VMDebug.isDebuggerConnected();
		}

		/**
		* Returns an array of strings that identify VM features. This is
		* used by DDMS to determine what sorts of operations the VM can
		* perform.
		*
		* @hide
		*/
		public static String[] getVmFeatureList() {
		return VMDebug.getVmFeatureList();
		}

		/**
		* Change the JDWP port.
		*