update new sdk
This commit is contained in:
parent
f33907443a
commit
744c72c133
1643 changed files with 83006 additions and 28021 deletions
6
android/system/vold/Utils.cpp
Normal file → Executable file
6
android/system/vold/Utils.cpp
Normal file → Executable file
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue