From 174ed56b879c9d132622d24e94eb25b850f5d17a Mon Sep 17 00:00:00 2001 From: Howard Ro Date: Sun, 7 Apr 2019 22:17:58 -0700 Subject: [PATCH] BinaryPushStateChanged enum updates 1. Updating enums as below INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_INITIATED -> INSTALLER_ROLLBACK_STAGED_CANCEL_REQUESTED INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_SUCCESS -> INSTALLER_ROLLBACK_STAGED_CANCEL_SUCCESS INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_FAILURE -> INSTALLER_ROLLBACK_STAGED_CANCEL_FAILURE 2. Removes INSTALLER_ROLLBACK_CANCEL_STAGED_REMOVE_FROM_QUEUE as it means the same as INSTALLER_ROLLBACK_STAGED_CANCEL_SUCCESS Bug: 130182007 Test: make Change-Id: I25f610720a46858282adb724b14265a8c7af09f3 --- cmds/statsd/src/atoms.proto | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index cbb78bf5732c6..070b4d7188689 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -3321,13 +3321,12 @@ message BinaryPushStateChanged { INSTALLER_ROLLBACK_BOOT_TRIGGERED_FAILURE = 14; INSTALLER_ROLLBACK_SUCCESS = 15; INSTALLER_ROLLBACK_FAILURE = 16; - INSTALLER_ROLLBACK_CANCEL_STAGED_REMOVE_FROM_QUEUE = 17; - INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_INITIATED = 18; - INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_SUCCESS = 19; - INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_FAILURE = 20; - INSTALL_STAGED_CANCEL_REQUESTED = 21; - INSTALL_STAGED_CANCEL_SUCCESS = 22; - INSTALL_STAGED_CANCEL_FAILURE = 23; + INSTALLER_ROLLBACK_STAGED_CANCEL_REQUESTED = 17; + INSTALLER_ROLLBACK_STAGED_CANCEL_SUCCESS = 18; + INSTALLER_ROLLBACK_STAGED_CANCEL_FAILURE = 19; + INSTALL_STAGED_CANCEL_REQUESTED = 20; + INSTALL_STAGED_CANCEL_SUCCESS = 21; + INSTALL_STAGED_CANCEL_FAILURE = 22; } optional State state = 6; // Possible experiment ids for monitoring this push. @@ -5814,13 +5813,12 @@ message TrainInfo { INSTALLER_ROLLBACK_BOOT_TRIGGERED_FAILURE = 14; INSTALLER_ROLLBACK_SUCCESS = 15; INSTALLER_ROLLBACK_FAILURE = 16; - INSTALLER_ROLLBACK_CANCEL_STAGED_REMOVE_FROM_QUEUE = 17; - INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_INITIATED = 18; - INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_SUCCESS = 19; - INSTALLER_ROLLBACK_CANCEL_STAGED_DELETE_SESSION_FAILURE = 20; - INSTALL_STAGED_CANCEL_REQUESTED = 21; - INSTALL_STAGED_CANCEL_SUCCESS = 22; - INSTALL_STAGED_CANCEL_FAILURE = 23; + INSTALLER_ROLLBACK_STAGED_CANCEL_REQUESTED = 17; + INSTALLER_ROLLBACK_STAGED_CANCEL_SUCCESS = 18; + INSTALLER_ROLLBACK_STAGED_CANCEL_FAILURE = 19; + INSTALL_STAGED_CANCEL_REQUESTED = 20; + INSTALL_STAGED_CANCEL_SUCCESS = 21; + INSTALL_STAGED_CANCEL_FAILURE = 22; } optional Status status = 4; }