Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7a1a6c8 authored by Howard Ro's avatar Howard Ro Committed by android-build-merger
Browse files

Merge "BinaryPushStateChanged enum updates" into qt-dev 

am: 10673d51

Change-Id: I2eff2d4e49f44bebe74f3e0765755cdf8c08131c
parents 57db0312 10673d51

cmds/statsd/src/atoms.proto

+12 −14
Original line number Diff line number Diff line
@@ -3251,13 +3251,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.
@@ -5748,13 +5747,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;

}