diff options
| author | Miguel Aranda <miguelaranda@google.com> | 2024-04-09 08:56:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-09 08:56:22 +0000 |
| commit | 2229cbe3427608c84a55f027d4f3f3e45154aa06 (patch) | |
| tree | 9621a5d66e27389f1aba98ab3ae7556a213c2878 | |
| parent | c6d35ae8b31bd38905313420e36c556579fe27ef (diff) | |
| parent | 63eec0237999499265eacc02a839f67b1a605ad7 (diff) | |
| download | conscrypt-2229cbe3427608c84a55f027d4f3f3e45154aa06.tar.gz | |
Merge "Change TLS metric Protocol/CipherSuite enums to use ints." into main
4 files changed, 8 insertions, 8 deletions
diff --git a/common/src/main/java/org/conscrypt/metrics/CipherSuite.java b/common/src/main/java/org/conscrypt/metrics/CipherSuite.java index 12d74460..bab5354c 100644 --- a/common/src/main/java/org/conscrypt/metrics/CipherSuite.java +++ b/common/src/main/java/org/conscrypt/metrics/CipherSuite.java @@ -63,7 +63,7 @@ public enum CipherSuite { TLS_CIPHER_FAILED(0xFFFF), ; - final short id; + final int id; public int getId() { return this.id; @@ -82,6 +82,6 @@ public enum CipherSuite { } private CipherSuite(int id) { - this.id = (short) id; + this.id = id; } }
\ No newline at end of file diff --git a/common/src/main/java/org/conscrypt/metrics/Protocol.java b/common/src/main/java/org/conscrypt/metrics/Protocol.java index 4762a4dc..31ef7147 100644 --- a/common/src/main/java/org/conscrypt/metrics/Protocol.java +++ b/common/src/main/java/org/conscrypt/metrics/Protocol.java @@ -33,7 +33,7 @@ public enum Protocol { TLS_PROTO_FAILED(0xFFFF), ; - final byte id; + final int id; public int getId() { return this.id; @@ -59,6 +59,6 @@ public enum Protocol { } private Protocol(int id) { - this.id = (byte) id; + this.id = id; } }
\ No newline at end of file diff --git a/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/CipherSuite.java b/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/CipherSuite.java index ed28d69b..0e03e737 100644 --- a/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/CipherSuite.java +++ b/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/CipherSuite.java @@ -65,7 +65,7 @@ public enum CipherSuite { TLS_CIPHER_FAILED(0xFFFF), ; - final short id; + final int id; public int getId() { return this.id; @@ -84,6 +84,6 @@ public enum CipherSuite { } private CipherSuite(int id) { - this.id = (short) id; + this.id = id; } }
\ No newline at end of file diff --git a/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/Protocol.java b/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/Protocol.java index dda1f38a..96ea739c 100644 --- a/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/Protocol.java +++ b/repackaged/common/src/main/java/com/android/org/conscrypt/metrics/Protocol.java @@ -35,7 +35,7 @@ public enum Protocol { TLS_PROTO_FAILED(0xFFFF), ; - final byte id; + final int id; public int getId() { return this.id; @@ -61,6 +61,6 @@ public enum Protocol { } private Protocol(int id) { - this.id = (byte) id; + this.id = id; } }
\ No newline at end of file |