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

Commit 81c9ea40 authored by Oleksiy Vyalov's avatar Oleksiy Vyalov Committed by Android (Google) Code Review
Browse files

Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev

parents 73ebf33d b68bcbdf

core/java/android/ddm/DdmHandleHello.java

+4 −1
Original line number Diff line number Diff line
@@ -136,12 +136,14 @@ public class DdmHandleHello extends ChunkHandler { 
        }

        String vmFlags = "CheckJNI="

            + (vmRuntime.isCheckJniEnabled() ? "true" : "false");

        boolean isNativeDebuggable = vmRuntime.isNativeDebuggable();



        ByteBuffer out = ByteBuffer.allocate(28

                            + vmIdent.length() * 2

                            + appName.length() * 2

                            + instructionSetDescription.length() * 2

                            + vmFlags.length() * 2);

                            + vmFlags.length() * 2

                            + 1);

        out.order(ChunkHandler.CHUNK_ORDER);

        out.putInt(DdmServer.CLIENT_PROTOCOL_VERSION);

        out.putInt(android.os.Process.myPid());
@@ -154,6 +156,7 @@ public class DdmHandleHello extends ChunkHandler { 
        putString(out, instructionSetDescription);

        out.putInt(vmFlags.length());

        putString(out, vmFlags);

        out.put((byte)(isNativeDebuggable ? 1 : 0));



        Chunk reply = new Chunk(CHUNK_HELO, out);