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

Commit c076e34c authored by Marco Nelissen's avatar Marco Nelissen Committed by Automerger Merge Worker
Browse files

Merge changes Ib2a3c881,Ia9b17f4e am: 7df90c1a am: f6bbe4e8 am: f3275dc4... 

Merge changes Ib2a3c881,Ia9b17f4e am: 7df90c1a am: f6bbe4e8 am: f3275dc4 am: f24ed3da am: 4bf47cc8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2191104



Change-Id: Ice80c2dbf80e10f5324b3cd0e1ad45815b01b17c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a354cb7 4bf47cc8

trusty/apploader/apploader.cpp

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

            LOG(ERROR) << "Error: loading denied by policy engine";

            break;

        case APPLOADER_ERR_NOT_ENCRYPTED:

            LOG(ERROR) << "Error: unmet application encryption requirement";

            break;

        default:

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

            break;

trusty/apploader/apploader_ipc.h

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ enum apploader_command : uint32_t { 
 * @APPLOADER_ERR_INTERNAL:             miscellaneous or internal apploader

 *                                      error not covered by the above

 * @APPLOADER_ERR_INVALID_VERSION:      invalid application version

 * @APPLOADER_ERR_POLICY_VIOLATION:     signature verification succeeded but

 *                                      key+manifest combination not allowed

 *                                      by app loader policy engine

 * @APPLOADER_ERR_NOT_ENCRYPTED:        unmet application encryption requirement

 */

enum apploader_error : uint32_t {

    APPLOADER_NO_ERROR = 0,
@@ -57,6 +61,7 @@ enum apploader_error : uint32_t { 
    APPLOADER_ERR_INTERNAL,

    APPLOADER_ERR_INVALID_VERSION,

    APPLOADER_ERR_POLICY_VIOLATION,

    APPLOADER_ERR_NOT_ENCRYPTED,

};



/**