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

Commit ee9b9554 authored by Tao Bao's avatar Tao Bao
Browse files

Fix the prefix matching for uncrypt status. 

Also change its logging statement from PLOG to LOG, since
android::base::StartsWith() doesn't set errno.

Test: Build and reboot into recovery image. Check last_log.

Change-Id: I55ac7eec24228db76a13580958b4a4330b06cf57
parent c5b4b719

install.cpp

+2 −2
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ install_package(const char* path, bool* wipe_cache, const char* install_file, 
        std::string uncrypt_status;

        if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {

            PLOG(WARNING) << "failed to read uncrypt status";

        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_:")) {

            PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;

        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {

            LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;

        } else {

            log_buffer.push_back(android::base::Trim(uncrypt_status));

        }