Merge "Fix some special usb can't mount issue." into main am: 77f8b00c3d
am: a3b07ee49d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3046093 Change-Id: I33b586ef09adfde29bd0c2699ce7e7aed28c5781 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
006d00bede
1 changed files with 3 additions and 1 deletions
|
@ -365,7 +365,6 @@ status_t Disk::readPartitions() {
|
|||
continue;
|
||||
}
|
||||
} else if (*it == "PART") {
|
||||
foundParts = true;
|
||||
|
||||
if (++it == split.end()) continue;
|
||||
int i = 0;
|
||||
|
@ -390,6 +389,7 @@ status_t Disk::readPartitions() {
|
|||
case 0x0c: // W95 FAT32 (LBA)
|
||||
case 0x0e: // W95 FAT16 (LBA)
|
||||
createPublicVolume(partDevice);
|
||||
foundParts = true;
|
||||
break;
|
||||
}
|
||||
} else if (table == Table::kGpt) {
|
||||
|
@ -400,8 +400,10 @@ status_t Disk::readPartitions() {
|
|||
|
||||
if (android::base::EqualsIgnoreCase(typeGuid, kGptBasicData)) {
|
||||
createPublicVolume(partDevice);
|
||||
foundParts = true;
|
||||
} else if (android::base::EqualsIgnoreCase(typeGuid, kGptAndroidExpand)) {
|
||||
createPrivateVolume(partDevice, partGuid);
|
||||
foundParts = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue