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

Commit 20efd892 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "fastbootd: Add better logging for flashing failures." am: a0904183... 

Merge "fastbootd: Add better logging for flashing failures." am: a0904183 am: 2904defe am: 86f07627

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



Change-Id: Ib61cbf513cef0d149bfd0eef580cf3b6ff9bab39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db53cced 86f07627

fastboot/device/flashing.cpp

+10 −1
Original line number Diff line number Diff line
@@ -121,7 +121,12 @@ int FlashRawData(PartitionHandle* handle, const std::vector<char>& downloaded_da 
int WriteCallback(void* priv, const void* data, size_t len) {

    PartitionHandle* handle = reinterpret_cast<PartitionHandle*>(priv);

    if (!data) {

        return lseek64(handle->fd(), len, SEEK_CUR) >= 0 ? 0 : -errno;

        if (lseek64(handle->fd(), len, SEEK_CUR) < 0) {

            int rv = -errno;

            PLOG(ERROR) << "lseek failed";

            return rv;

        }

        return 0;

    }

    return FlashRawDataChunk(handle, reinterpret_cast<const char*>(data), len);

}
@@ -131,6 +136,7 @@ int FlashSparseData(PartitionHandle* handle, std::vector<char>& downloaded_data) 
                                                      downloaded_data.size(), true, false);

    if (!file) {

        // Invalid sparse format

        LOG(ERROR) << "Unable to open sparse data for flashing";

        return -EINVAL;

    }

    return sparse_file_callback(file, false, false, WriteCallback, reinterpret_cast<void*>(handle));
@@ -175,10 +181,13 @@ int Flash(FastbootDevice* device, const std::string& partition_name) { 


    std::vector<char> data = std::move(device->download_data());

    if (data.size() == 0) {

        LOG(ERROR) << "Cannot flash empty data vector";

        return -EINVAL;

    }

    uint64_t block_device_size = get_block_device_size(handle.fd());

    if (data.size() > block_device_size) {

        LOG(ERROR) << "Cannot flash " << data.size() << " bytes to block device of size "

                   << block_device_size;

        return -EOVERFLOW;

    } else if (data.size() < block_device_size &&

               (partition_name == "boot" || partition_name == "boot_a" ||

fastboot/device/main.cpp

+17 −0
Original line number Diff line number Diff line
@@ -14,13 +14,30 @@ 
 * limitations under the License.

 */



#include <stdarg.h>



#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <sparse/sparse.h>



#include "fastboot_device.h"



static void LogSparseVerboseMessage(const char* fmt, ...) {

    std::string message;



    va_list ap;

    va_start(ap, fmt);

    android::base::StringAppendV(&message, fmt, ap);

    va_end(ap);



    LOG(ERROR) << "libsparse message: " << message;

}



int main(int /*argc*/, char* argv[]) {

    android::base::InitLogging(argv, &android::base::KernelLogger);



    sparse_print_verbose = LogSparseVerboseMessage;



    while (true) {

        FastbootDevice device;

        device.ExecuteCommands();