diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-20 00:21:27 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-20 00:21:27 +0000 |
commit | 79fb21def213fb52d1ec06059ca25d302c9c43fa (patch) | |
tree | c0955d8c26676c5f02c9a49ff862fae5ec1e347c | |
parent | a2dbe4c087c20e5163c2eee86bd335e5b15b7615 (diff) | |
parent | 940a1ff70cfc5f2e4de83da9ad84cd9734faadf6 (diff) | |
download | vold-oreo-m4-s11-release.tar.gz |
Merge cherrypicks of [4583929, 4582754, 4582755, 4582756, 4583930, 4583931, 4583932, 4586307, 4586953, 4582585, 4586964, 4586965, 4586984, 4586985, 4586986, 4586987, 4586966, 4582586, 4582885, 4586531, 4586532, 4586533, 4586535, 4586536, 4586537, 4586538, 4586539, 4586540, 4586541, 4586542, 4586890, 4586891, 4586892, 4586893, 4586894, 4586895, 4586896, 4586897, 4586898, 4586899, 4586900, 4586901, 4586902, 4586903, 4587104, 4587105, 4587106, 4586988, 4583933, 4583934, 4583935, 4586989, 4586990, 4587136, 4587138, 4586991, 4586308, 4586967, 4587069, 4587070, 4582886, 4582887, 4587164, 4582888, 4587027, 4587028, 4587029, 4587030, 4582587, 4582588, 4582589, 4582590, 4582591, 4582592, 4582593, 4582594, 4582595, 4582596, 4582597, 4582598, 4582599, 4582600, 4582601, 4582602, 4582603, 4587244, 4587245, 4587246, 4587247, 4587248, 4587249, 4587250, 4587251, 4587252, 4582760, 4583936, 4582761, 4586992, 4587229, 4587230, 4587231, 4587253, 4586968] into sparse-4732991-L37700000192334752android-8.1.0_r42oreo-m4-s11-release
Change-Id: I94d450b002f33e0f1034cfe55a23ec2f4aff85c1
-rw-r--r-- | Utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -213,17 +213,17 @@ static status_t readMetadata(const std::string& path, std::string& fsType, for (const auto& line : output) { // Extract values from blkid output, if defined const char* cline = line.c_str(); - const char* start = strstr(cline, "TYPE="); + const char* start = strstr(cline, "TYPE=\""); if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { fsType = value; } - start = strstr(cline, "UUID="); + start = strstr(cline, "UUID=\""); if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { fsUuid = value; } - start = strstr(cline, "LABEL="); + start = strstr(cline, "LABEL=\""); if (start != nullptr && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) { fsLabel = value; } |