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

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

Merge "trusty_apploader: log to stderr" am: e0e160c5 am: dd538a6e am: dc07d407 

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

Change-Id: Ie98c87580c4a33296dd9dd7fd0cbc6e52da2d6a1
parents 85216ed7 dc07d407

trusty/apploader/apploader.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -245,6 +245,8 @@ static ssize_t send_app_package(const char* package_file_name) { 
    tipc_fd = tipc_connect(dev_name, APPLOADER_PORT);

    tipc_fd = tipc_connect(dev_name, APPLOADER_PORT);

    if (tipc_fd < 0) {

    if (tipc_fd < 0) {

        LOG(ERROR) << "Failed to connect to Trusty app loader: " << strerror(-tipc_fd);

        LOG(ERROR) << "Failed to connect to Trusty app loader: " << strerror(-tipc_fd);

        // print this to stderr too to avoid silently exiting when run as non-root

        fprintf(stderr, "Failed to connect to Trusty app loader: %s\n", strerror(-tipc_fd));

        rc = tipc_fd;

        rc = tipc_fd;

        goto err_tipc_connect;

        goto err_tipc_connect;

    }

    }