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

Commit 7c8ec7b3 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Gerrit Code Review
Browse files

Merge "trusty: apploader: Handle invalid version error"

parents 2e3dabc6 4b5afea9

trusty/apploader/apploader.cpp

+3 −0
Original line number Diff line number Diff line
@@ -220,6 +220,9 @@ static ssize_t read_response(int tipc_fd) { 
        case APPLOADER_ERR_INTERNAL:

            LOG(ERROR) << "Error: internal apploader error";

            break;

        case APPLOADER_ERR_INVALID_VERSION:

            LOG(ERROR) << "Error: invalid application version";

            break;

        default:

            LOG(ERROR) << "Unrecognized error: " << resp.error;

            break;

trusty/apploader/apploader_ipc.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ enum apploader_command : uint32_t { 
 * @APPLOADER_ERR_ALREADY_EXISTS:       application has already been loaded

 * @APPLOADER_ERR_INTERNAL:             miscellaneous or internal apploader

 *                                      error not covered by the above

 * @APPLOADER_ERR_INVALID_VERSION:      invalid application version

 */

enum apploader_error : uint32_t {

    APPLOADER_NO_ERROR = 0,
@@ -54,6 +55,7 @@ enum apploader_error : uint32_t { 
    APPLOADER_ERR_LOADING_FAILED,

    APPLOADER_ERR_ALREADY_EXISTS,

    APPLOADER_ERR_INTERNAL,

    APPLOADER_ERR_INVALID_VERSION,

};



/**