LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NativeDaemonConnector: Improve error reporting and debug formatting

Browse Source 
Updated:
  NativeDaemonConnector: Put debugging behind a conditional

Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat
2010-02-04 15:09:02 -08:00
parent c9b5476b73
commit f0d2199fc7
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/NativeDaemonConnector.java
View File

@@ -21,7 +21,6 @@ import android.net.LocalSocket;
import android.os.Environment; import android.os.Environment;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.util.Config;
import android.util.Log; import android.util.Log;
import java.io.IOException; import java.io.IOException;
@@ -41,6 +40,7 @@ import java.util.concurrent.LinkedBlockingQueue;
* protocol. * protocol.
*/ */
final class NativeDaemonConnector implements Runnable { final class NativeDaemonConnector implements Runnable {
private static final boolean LOCAL_LOGD = false;
private BlockingQueue<String> mResponseQueue; private BlockingQueue<String> mResponseQueue;
private OutputStream mOutputStream; private OutputStream mOutputStream;
@@ -110,7 +110,7 @@ final class NativeDaemonConnector implements Runnable {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (buffer[i] == 0) { if (buffer[i] == 0) {
String event = new String(buffer, start, i - start); String event = new String(buffer, start, i - start);
// Log.d(TAG, "Got packet {" + event + "}"); if (LOCAL_LOGD) Log.d(TAG, String.format("RCV <- {%s}", event));
String[] tokens = event.split(" "); String[] tokens = event.split(" ");
try { try {
@@ -177,7 +177,7 @@ final class NativeDaemonConnector implements Runnable {
*/ */
private void sendCommand(String command, String argument) { private void sendCommand(String command, String argument) {
synchronized (this) { synchronized (this) {
Log.d(TAG, "sendCommand {" + command + "} {" + argument + "}"); if (LOCAL_LOGD) Log.d(TAG, String.format("SND -> {%s} {%s}", command, argument));
if (mOutputStream == null) { if (mOutputStream == null) {
Log.e(TAG, "No connection to daemon", new IllegalStateException()); Log.e(TAG, "No connection to daemon", new IllegalStateException());
} else { } else {
@@ -210,7 +210,7 @@ final class NativeDaemonConnector implements Runnable {
while (!complete) { while (!complete) {
try { try {
String line = mResponseQueue.take(); String line = mResponseQueue.take();
Log.d(TAG, String.format("RSP -> {%s}", line)); if (LOCAL_LOGD) Log.d(TAG, String.format("RSP <- {%s}", line));
String[] tokens = line.split(" "); String[] tokens = line.split(" ");
try { try {
code = Integer.parseInt(tokens[0]); code = Integer.parseInt(tokens[0]);
@@ -250,13 +250,18 @@ final class NativeDaemonConnector implements Runnable {
String[] rdata = new String[rsp.size()-1]; String[] rdata = new String[rsp.size()-1];
int idx = 0; int idx = 0;
for (String line : rsp) { for (int i = 0; i < rsp.size(); i++) {
String line = rsp.get(i);
try { try {
String[] tok = line.split(" "); String[] tok = line.split(" ");
int code = Integer.parseInt(tok[0]); int code = Integer.parseInt(tok[0]);
if (code == expectedResponseCode) { if (code == expectedResponseCode) {
rdata[idx++] = line.substring(tok[0].length() + 1); rdata[idx++] = line.substring(tok[0].length() + 1);
} else if (code == NativeDaemonConnector.ResponseCode.CommandOkay) { } else if (code == NativeDaemonConnector.ResponseCode.CommandOkay) {
if (LOCAL_LOGD) Log.d(TAG, String.format("List terminated with {%s}", line));
if (i != rsp.size()) {
Log.w(TAG, String.format("Recv'd %d lines after list term", (rsp.size()-i)));
}
return rdata; return rdata;
} else { } else {
throw new NativeDaemonConnectorException( throw new NativeDaemonConnectorException(