Snap for 11728787 from 006d00bede to 24Q3-release

Change-Id: I05ac3c082dc1af55e5f3c0bdba5a501154d03c69
This commit is contained in:
Android Build Coastguard Worker 2024-04-17 23:26:03 +00:00
commit 6b1e589a46

View file

@ -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;
}
}
}