summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Hibdon <mhibdon@google.com>2014-11-02 17:30:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-02 17:30:42 +0000
commitab743fb543424c2e18558881f7264b1a66b6ce2c (patch)
tree4a1687f856d1362bb3bcff4d05fca54b272374a0
parent979511590cafb226edefa6e5219e42d7a1b2cad6 (diff)
parent0f6acb548b61eabff2a78366c05a8e8c10e25850 (diff)
downloadandroid_packages_apps_Email-ab743fb543424c2e18558881f7264b1a66b6ce2c.tar.gz
android_packages_apps_Email-ab743fb543424c2e18558881f7264b1a66b6ce2c.tar.bz2
android_packages_apps_Email-ab743fb543424c2e18558881f7264b1a66b6ce2c.zip
am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets
* commit '0f6acb548b61eabff2a78366c05a8e8c10e25850': Add additional analytics regarding our SSLSockets
-rw-r--r--provider_src/com/android/email/mail/transport/MailTransport.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/provider_src/com/android/email/mail/transport/MailTransport.java b/provider_src/com/android/email/mail/transport/MailTransport.java
index 657c10072..26801f93f 100644
--- a/provider_src/com/android/email/mail/transport/MailTransport.java
+++ b/provider_src/com/android/email/mail/transport/MailTransport.java
@@ -122,10 +122,13 @@ public class MailTransport {
if (canTrySslSecurity() && !canTrustAllCertificates()) {
verifyHostname(mSocket, getHost());
}
+ Analytics.getInstance().sendEvent("socket_certificates",
+ "open", Boolean.toString(canTrustAllCertificates()), 0);
if (mSocket instanceof SSLSocket) {
final SSLSocket sslSocket = (SSLSocket) mSocket;
if (sslSocket.getSession() != null) {
- Analytics.getInstance().sendEvent("cipher_suite", "open",
+ Analytics.getInstance().sendEvent("cipher_suite",
+ sslSocket.getSession().getProtocol(),
sslSocket.getSession().getCipherSuite(), 0);
}
}
@@ -167,9 +170,12 @@ public class MailTransport {
mIn = new BufferedInputStream(mSocket.getInputStream(), 1024);
mOut = new BufferedOutputStream(mSocket.getOutputStream(), 512);
+ Analytics.getInstance().sendEvent("socket_certificates",
+ "reopenTls", Boolean.toString(canTrustAllCertificates()), 0);
final SSLSocket sslSocket = (SSLSocket) mSocket;
if (sslSocket.getSession() != null) {
- Analytics.getInstance().sendEvent("cipher_suite", "reopenTls",
+ Analytics.getInstance().sendEvent("cipher_suite",
+ sslSocket.getSession().getProtocol(),
sslSocket.getSession().getCipherSuite(), 0);
}
} catch (SSLException e) {