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

donut snapshot

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2009-08-11 13:12:34 -07:00
parent 5c1207be90
commit ac1e59d887
343 changed files with 52130 additions and 12962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystore/java/android/security/CertTool.java
View File

@@ -209,6 +209,10 @@ public class CertTool {
}
freeX509Certificate(handle);
}
if (intent != null) context.startActivity(intent);
if (intent != null) {
context.startActivity(intent);
} else {
Log.w("CertTool", "incorrect data for addCertificate()");
}
}
}

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;
}