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

Commit e5772324 authored by Andy McFadden's avatar Andy McFadden
Browse files

Move VM feature strings (used by DDMS) into VM. 

Until now, we used a place-holder in frameworks/base.

Disable a test that shouldn't have been on.
parent a69a23b2

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");

core/java/android/os/Debug.java

+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.

     *