summaryrefslogtreecommitdiffstats
path: root/core/java/android/ddm
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/ddm')
-rw-r--r--core/java/android/ddm/DdmHandleAppName.java3
-rw-r--r--core/java/android/ddm/DdmHandleExit.java3
-rw-r--r--core/java/android/ddm/DdmHandleHeap.java17
-rw-r--r--core/java/android/ddm/DdmHandleHello.java11
-rw-r--r--core/java/android/ddm/DdmHandleProfiling.java9
-rw-r--r--core/java/android/ddm/DdmHandleThread.java3
-rw-r--r--core/java/android/ddm/DdmRegister.java3
7 files changed, 21 insertions, 28 deletions
diff --git a/core/java/android/ddm/DdmHandleAppName.java b/core/java/android/ddm/DdmHandleAppName.java
index 4a57d12..78dd23e 100644
--- a/core/java/android/ddm/DdmHandleAppName.java
+++ b/core/java/android/ddm/DdmHandleAppName.java
@@ -19,7 +19,6 @@ 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.Config;
import android.util.Log;
import java.nio.ByteBuffer;
@@ -88,7 +87,7 @@ public class DdmHandleAppName extends ChunkHandler {
* Send an APNM (APplication NaMe) chunk.
*/
private static void sendAPNM(String appName) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm", "Sending app name");
ByteBuffer out = ByteBuffer.allocate(4 + appName.length()*2);
diff --git a/core/java/android/ddm/DdmHandleExit.java b/core/java/android/ddm/DdmHandleExit.java
index 8a0b9a4..74ae37a 100644
--- a/core/java/android/ddm/DdmHandleExit.java
+++ b/core/java/android/ddm/DdmHandleExit.java
@@ -19,7 +19,6 @@ 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.Config;
import android.util.Log;
import java.nio.ByteBuffer;
@@ -59,7 +58,7 @@ public class DdmHandleExit extends ChunkHandler {
* Handle a chunk of data. We're only registered for "EXIT".
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-exit", "Handling " + name(request.type) + " chunk");
/*
diff --git a/core/java/android/ddm/DdmHandleHeap.java b/core/java/android/ddm/DdmHandleHeap.java
index fa0fbbf..cece556 100644
--- a/core/java/android/ddm/DdmHandleHeap.java
+++ b/core/java/android/ddm/DdmHandleHeap.java
@@ -21,7 +21,6 @@ import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
import org.apache.harmony.dalvik.ddmc.DdmVmInternal;
import android.os.Debug;
-import android.util.Config;
import android.util.Log;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -78,7 +77,7 @@ public class DdmHandleHeap extends ChunkHandler {
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Handling " + name(request.type) + " chunk");
int type = request.type;
@@ -113,7 +112,7 @@ public class DdmHandleHeap extends ChunkHandler {
ByteBuffer in = wrapChunk(request);
int when = in.get();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Heap segment enable: when=" + when);
boolean ok = DdmVmInternal.heapInfoNotify(when);
@@ -132,7 +131,7 @@ public class DdmHandleHeap extends ChunkHandler {
int when = in.get();
int what = in.get();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Heap segment enable: when=" + when
+ ", what=" + what + ", isNative=" + isNative);
@@ -160,7 +159,7 @@ public class DdmHandleHeap extends ChunkHandler {
/* get the filename for the output file */
int len = in.getInt();
String fileName = getString(in, len);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Heap dump: file='" + fileName + "'");
try {
@@ -192,7 +191,7 @@ public class DdmHandleHeap extends ChunkHandler {
byte result;
/* get the filename for the output file */
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Heap dump: [DDMS]");
String failMsg = null;
@@ -218,7 +217,7 @@ public class DdmHandleHeap extends ChunkHandler {
private Chunk handleHPGC(Chunk request) {
//ByteBuffer in = wrapChunk(request);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Heap GC request");
System.gc();
@@ -234,7 +233,7 @@ public class DdmHandleHeap extends ChunkHandler {
enable = (in.get() != 0);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Recent allocation enable request: " + enable);
DdmVmInternal.enableRecentAllocations(enable);
@@ -259,7 +258,7 @@ public class DdmHandleHeap extends ChunkHandler {
private Chunk handleREAL(Chunk request) {
//ByteBuffer in = wrapChunk(request);
- if (Config.LOGD)
+ if (false)
Log.d("ddm-heap", "Recent allocations request");
/* generate the reply in a ready-to-go format */
diff --git a/core/java/android/ddm/DdmHandleHello.java b/core/java/android/ddm/DdmHandleHello.java
index 714a611..5088d22 100644
--- a/core/java/android/ddm/DdmHandleHello.java
+++ b/core/java/android/ddm/DdmHandleHello.java
@@ -19,7 +19,6 @@ 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.Config;
import android.util.Log;
import android.os.Debug;
@@ -53,7 +52,7 @@ public class DdmHandleHello extends ChunkHandler {
* send messages to the server.
*/
public void connected() {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-hello", "Connected!");
if (false) {
@@ -70,7 +69,7 @@ public class DdmHandleHello extends ChunkHandler {
* periodic transmissions or clean up saved state.
*/
public void disconnected() {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-hello", "Disconnected!");
}
@@ -78,7 +77,7 @@ public class DdmHandleHello extends ChunkHandler {
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Handling " + name(request.type) + " chunk");
int type = request.type;
@@ -105,7 +104,7 @@ public class DdmHandleHello extends ChunkHandler {
ByteBuffer in = wrapChunk(request);
int serverProtoVers = in.getInt();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-hello", "Server version is " + serverProtoVers);
/*
@@ -150,7 +149,7 @@ public class DdmHandleHello extends ChunkHandler {
// is actually compiled in
final String[] features = Debug.getVmFeatureList();
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Got feature list request");
int size = 4 + 4 * features.length;
diff --git a/core/java/android/ddm/DdmHandleProfiling.java b/core/java/android/ddm/DdmHandleProfiling.java
index 63ee445..e0db5e7 100644
--- a/core/java/android/ddm/DdmHandleProfiling.java
+++ b/core/java/android/ddm/DdmHandleProfiling.java
@@ -20,7 +20,6 @@ import org.apache.harmony.dalvik.ddmc.Chunk;
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
import android.os.Debug;
-import android.util.Config;
import android.util.Log;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -69,7 +68,7 @@ public class DdmHandleProfiling extends ChunkHandler {
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Handling " + name(request.type) + " chunk");
int type = request.type;
@@ -99,7 +98,7 @@ public class DdmHandleProfiling extends ChunkHandler {
int flags = in.getInt();
int len = in.getInt();
String fileName = getString(in, len);
- if (Config.LOGV)
+ if (false)
Log.v("ddm-heap", "Method profiling start: filename='" + fileName
+ "', size=" + bufferSize + ", flags=" + flags);
@@ -139,7 +138,7 @@ public class DdmHandleProfiling extends ChunkHandler {
int bufferSize = in.getInt();
int flags = in.getInt();
- if (Config.LOGV) {
+ if (false) {
Log.v("ddm-heap", "Method prof stream start: size=" + bufferSize
+ ", flags=" + flags);
}
@@ -158,7 +157,7 @@ public class DdmHandleProfiling extends ChunkHandler {
private Chunk handleMPSE(Chunk request) {
byte result;
- if (Config.LOGV) {
+ if (false) {
Log.v("ddm-heap", "Method prof stream end");
}
diff --git a/core/java/android/ddm/DdmHandleThread.java b/core/java/android/ddm/DdmHandleThread.java
index c307988..613ab75 100644
--- a/core/java/android/ddm/DdmHandleThread.java
+++ b/core/java/android/ddm/DdmHandleThread.java
@@ -20,7 +20,6 @@ import org.apache.harmony.dalvik.ddmc.Chunk;
import org.apache.harmony.dalvik.ddmc.ChunkHandler;
import org.apache.harmony.dalvik.ddmc.DdmServer;
import org.apache.harmony.dalvik.ddmc.DdmVmInternal;
-import android.util.Config;
import android.util.Log;
import java.nio.ByteBuffer;
@@ -66,7 +65,7 @@ public class DdmHandleThread extends ChunkHandler {
* Handle a chunk of data.
*/
public Chunk handleChunk(Chunk request) {
- if (Config.LOGV)
+ if (false)
Log.v("ddm-thread", "Handling " + name(request.type) + " chunk");
int type = request.type;
diff --git a/core/java/android/ddm/DdmRegister.java b/core/java/android/ddm/DdmRegister.java
index debf189..ecd450d 100644
--- a/core/java/android/ddm/DdmRegister.java
+++ b/core/java/android/ddm/DdmRegister.java
@@ -17,7 +17,6 @@
package android.ddm;
import org.apache.harmony.dalvik.ddmc.DdmServer;
-import android.util.Config;
import android.util.Log;
/**
@@ -44,7 +43,7 @@ public class DdmRegister {
* we finish here.
*/
public static void registerHandlers() {
- if (Config.LOGV)
+ if (false)
Log.v("ddm", "Registering DDM message handlers");
DdmHandleHello.register();
DdmHandleThread.register();