diff options
| author | Nikita Iashchenko <nikitai@google.com> | 2020-11-02 08:10:45 +0000 |
|---|---|---|
| committer | Nikita Iashchenko <nikitai@google.com> | 2020-11-03 16:48:04 +0000 |
| commit | ff64fd0f36852877f605f1464163b0ee51f651f0 (patch) | |
| tree | b1e76224c5edc7190b83f35042476bdf78a7b26c /cmds | |
| parent | f860dff75b6be8d35eaf48b6267608ee79a53ee1 (diff) | |
Import TLS handshake atom for Conscrypt
Bug: 160345816
Test: m droid
Change-Id: I7ddf7626376bd649c8b10306d464b783cf16959b
Merged-In: I142a792c34dced6b0e27b867ed3a1d95249a5f7f
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/statsd/src/atoms.proto | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 12ef9ba0fb8b..cca6299b74b8 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -58,6 +58,7 @@ import "frameworks/base/core/proto/android/stats/mediaprovider/mediaprovider_enu import "frameworks/base/core/proto/android/stats/storage/storage_enums.proto"; import "frameworks/base/core/proto/android/stats/style/style_enums.proto"; import "frameworks/base/core/proto/android/stats/sysui/notification_enums.proto"; +import "frameworks/base/core/proto/android/stats/tls/enums.proto"; import "frameworks/base/core/proto/android/telecomm/enums.proto"; import "frameworks/base/core/proto/android/telephony/enums.proto"; import "frameworks/base/core/proto/android/view/enums.proto"; @@ -485,6 +486,7 @@ message Atom { NetworkTetheringReported network_tethering_reported = 303 [(module) = "network_tethering"]; ImeTouchReported ime_touch_reported = 304 [(module) = "sysui"]; + TlsHandshakeReported tls_handshake_reported = 317 [(module) = "conscrypt"]; // StatsdStats tracks platform atoms with ids upto 500. // Update StatsdStats::kMaxPushedAtomId when atom ids here approach that value. @@ -11197,3 +11199,19 @@ message BlobInfo { // List of leasees of this Blob optional BlobLeaseeListProto leasees = 5; } + +/** + * Pushes TLS handshake counters from Conscrypt. + * Pulled from: + * external/conscrypt/common/src/main/java/org/conscrypt/ConscryptEngineSocket.java + * external/conscrypt/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java + */ + message TlsHandshakeReported { + optional bool success = 1; + + optional android.stats.tls.Protocol protocol = 2; + + optional android.stats.tls.CipherSuite cipher_suite = 3; + + optional int32 handshake_duration_millis = 4; +} |