DO NOT MERGE Report uncrypt errors in details

am: 37d7d67ca2 Change-Id: I4da910cde3f1a84b9dfb5839a43b00818a942dbd
2016-09-29 18:13:20 +00:00
parent 64b92dfb5d 37d7d67ca2
commit 4c53af080d
3 changed files with 75 additions and 40 deletions
@@ -540,7 +540,7 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
        std::string uncrypt_status;
        if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
            LOGW("failed to read uncrypt status: %s\n", strerror(errno));
-        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_time:")) {
+        } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
            LOGW("corrupted uncrypt_status: %s: %s\n", uncrypt_status.c_str(), strerror(errno));
        } else {
            log_buffer.push_back(android::base::Trim(uncrypt_status));