Merge "Move CLIENT_PROTOCOL_VERSION to point of use" am: a75411975a

am: 71e1bf58d0

Change-Id: Icede435f038840eab78c5c5d3758af680b6ed2ce

1 files changed, 9 insertions, 5 deletions

diff --git a/core/java/android/ddm/DdmHandleHello.java b/core/java/android/ddm/DdmHandleHello.java
index b2288fc4492d..87568e857d6d 100644
--- a/core/java/android/ddm/DdmHandleHello.java
+++ b/core/java/android/ddm/DdmHandleHello.java
@@ -16,14 +16,16 @@
 
 package android.ddm;
 
-import org.apache.harmony.dalvik.ddmc.Chunk;
-import org.apache.harmony.dalvik.ddmc.ChunkHandler;
-import org.apache.harmony.dalvik.ddmc.DdmServer;
-import android.util.Log;
 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.ChunkHandler;
+import org.apache.harmony.dalvik.ddmc.DdmServer;
+
 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_FEAT = type("FEAT");
 
+    private static final int CLIENT_PROTOCOL_VERSION = 1;
+
     private static DdmHandleHello mInstance = new DdmHandleHello();
 
     private static final String[] FRAMEWORK_FEATURES = new String[] {
@@ -145,7 +149,7 @@ public class DdmHandleHello extends ChunkHandler {
                             + vmFlags.length() * 2
                             + 1);
         out.order(ChunkHandler.CHUNK_ORDER);
-        out.putInt(DdmServer.CLIENT_PROTOCOL_VERSION);
+        out.putInt(CLIENT_PROTOCOL_VERSION);
         out.putInt(android.os.Process.myPid());
         out.putInt(vmIdent.length());
         out.putInt(appName.length());