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

Merge change 9438 into donut

Browse Source 
* changes:
  Change some log.i to log.d.
This commit is contained in:
Android (Google) Code Review
2009-07-31 20:15:15 -07:00
parent 3159e3260e e81f51f44b
commit b86bad9493
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/keystore/netkeystore.c
View File

@@ -37,6 +37,7 @@
#include "netkeystore.h"
#include "keymgmt.h"
#define DBG 1
#define CMD_PUT_WITH_FILE "putfile"
typedef void CMD_FUNC(LPC_MARSHAL *cmd, LPC_MARSHAL *reply);
@@ -397,12 +398,12 @@ int main(const int argc, const char *argv[])
// read the command, execute and send the result back.
if(read_marshal(s, &cmd)) goto err;
LOGI("new connection\n");
if (DBG) LOGD("new connection\n");
execute(&cmd, &reply);
write_marshal(s, &reply);
err:
memset(&reply, 0, sizeof(LPC_MARSHAL));
LOGI("closing connection\n");
if (DBG) LOGD("closing connection\n");
close(s);
}

10
keystore/java/android/security/ServiceCommand.java
View File

@@ -49,6 +49,8 @@ public class ServiceCommand {
public static final int BUFFER_LENGTH = 4096;
private static final boolean DBG = true;
private String mServiceName;
private String mTag;
private InputStream mIn;
@@ -59,7 +61,7 @@ public class ServiceCommand {
if (mSocket != null) {
return true;
}
Log.i(mTag, "connecting...");
if (DBG) Log.d(mTag, "connecting...");
try {
mSocket = new LocalSocket();
@@ -78,7 +80,7 @@ public class ServiceCommand {
}
private void disconnect() {
Log.i(mTag,"disconnecting...");
if (DBG) Log.d(mTag,"disconnecting...");
try {
if (mSocket != null) mSocket.close();
} catch (IOException ex) { }
@@ -105,7 +107,7 @@ public class ServiceCommand {
}
off += count;
} catch (IOException ex) {
Log.e(mTag,"read exception");
Log.e(mTag,"read exception", ex);
break;
}
}
@@ -156,7 +158,7 @@ public class ServiceCommand {
mOut.write(buf, 0, 8);
mOut.write(data, 0, len);
} catch (IOException ex) {
Log.e(mTag,"write error");
Log.e(mTag,"write error", ex);
disconnect();
return false;
}