Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37

am: ece0b68ca6 Change-Id: I94f84db1cc053fa583adefc2ea69b3d4c0547de4
2016-10-19 00:48:02 +00:00
parent f258f601a0 ece0b68ca6
commit 502e34c301
1 changed files with 1 additions and 1 deletions
@@ -430,7 +430,7 @@ int applypatch_check(const char* filename, const std::vector<std::string>& patch
    // partitions, where the filename encodes the sha1s; no need to
    // check them twice.)
    if (LoadFileContents(filename, &file) != 0 ||
-        FindMatchingPatch(file.sha1, patch_sha1_str) < 0) {
+        (patch_sha1_str.size() > 0 && FindMatchingPatch(file.sha1, patch_sha1_str) < 0)) {
        printf("file \"%s\" doesn't have any of expected "
               "sha1 sums; checking cache\n", filename);