Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move CLIENT_PROTOCOL_VERSION to point of use"

Browse Source
This commit is contained in:
Treehugger Robot
2019-02-05 09:15:21 +00:00
committed by Gerrit Code Review
parent 17ed973b1b e649a56524
commit a75411975a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/ddm/DdmHandleHello.java
View File

@@ -16,13 +16,15 @@
package android.ddm; package android.ddm;
import android.os.Debug;
import android.os.UserHandle;
import android.util.Log;
import dalvik.system.VMRuntime;
import org.apache.harmony.dalvik.ddmc.Chunk; import org.apache.harmony.dalvik.ddmc.Chunk;
import org.apache.harmony.dalvik.ddmc.ChunkHandler; import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer; import org.apache.harmony.dalvik.ddmc.DdmServer;
import android.util.Log;
import android.os.Debug;
import android.os.UserHandle;
import dalvik.system.VMRuntime;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@@ -35,6 +37,8 @@ public class DdmHandleHello extends ChunkHandler {
public static final int CHUNK_WAIT = type("WAIT"); public static final int CHUNK_WAIT = type("WAIT");
public static final int CHUNK_FEAT = type("FEAT"); public static final int CHUNK_FEAT = type("FEAT");
private static final int CLIENT_PROTOCOL_VERSION = 1;
private static DdmHandleHello mInstance = new DdmHandleHello(); private static DdmHandleHello mInstance = new DdmHandleHello();
private static final String[] FRAMEWORK_FEATURES = new String[] { private static final String[] FRAMEWORK_FEATURES = new String[] {
@@ -145,7 +149,7 @@ public class DdmHandleHello extends ChunkHandler {
+ vmFlags.length() * 2 + vmFlags.length() * 2
+ 1); + 1);
out.order(ChunkHandler.CHUNK_ORDER); out.order(ChunkHandler.CHUNK_ORDER);
out.putInt(DdmServer.CLIENT_PROTOCOL_VERSION); out.putInt(CLIENT_PROTOCOL_VERSION);
out.putInt(android.os.Process.myPid()); out.putInt(android.os.Process.myPid());
out.putInt(vmIdent.length()); out.putInt(vmIdent.length());
out.putInt(appName.length()); out.putInt(appName.length());