commit 461f61e667463c325f6a80e1ffb4c8863ac14821
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 03 23:21:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 03 23:21:54 2021 +0000
tree bc4c0e2f3e6911c8a81f0818e0a35c801f1b85ae
parent f5f24e9bd4981208e05d31cd77bf727dae90d40d
parent f446449031902cc9784f34932d7cdc229e01c9e9

Merge "Support Eq and PartialEq for Rust enums."

stats/atoms.proto

diff --git a/stats/atoms.proto b/stats/atoms.proto
index 4c6de4a..5cf4e4a 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -5884,6 +5884,13 @@
         EXPECTED_MERGE_TARGET = 11;
         UNMERGED_SECTORS_AFTER_COMPLETION = 12;
         UNEXPECTED_MERGE_STATE = 13;
+        GET_COW_PATH_CONSISTENCY_CHECK = 14;
+        OPEN_COW_CONSISTENCY_CHECK = 15;
+        PARSE_COW_CONSISTENCY_CHECK = 16;
+        OPEN_COW_DIRECT_CONSISTENCY_CHECK = 17;
+        MEM_ALIGN_CONSISTENCY_CHECK = 18;
+        DIRECT_READ_CONSISTENCY_CHECK = 19;
+        WRONG_MERGE_COUNT_CONSISTENCY_CHECK = 20;
     };
 
     // Status of the update after the merge attempts.

stats/enums/app/enums.proto

diff --git a/stats/enums/app/enums.proto b/stats/enums/app/enums.proto
index bda2865..2344242 100644
--- a/stats/enums/app/enums.proto
+++ b/stats/enums/app/enums.proto
@@ -224,6 +224,8 @@
     APP_OP_BLUETOOTH_ADVERTISE = 114;
     APP_OP_RECORD_INCOMING_PHONE_AUDIO = 115;
     APP_OP_NEARBY_WIFI_DEVICES = 116;
+    APP_OP_ESTABLISH_VPN_SERVICE = 117;
+    APP_OP_ESTABLISH_VPN_MANAGER = 118;
 }
 
 /**