commit a078ea365a1116ddddb7fe46a1e1a5b0a7b3c8a0
author Ellen Arteca <emarteca@google.com> Thu Apr 18 03:04:25 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 18 03:04:25 2024 +0000
tree e310ddda3d311069bb2d1f18fffde1e9496fc3e5
parent 77f8b00c3d8b20dd0a2e1f2839824de68c6db979
parent 5177ed2e5030ed46ec34a581793890eaa167e4b1

Merge "Replace string secret with a byte[] for CE storage in vold binder" into main

model/Disk.cpp

diff --git a/model/Disk.cpp b/model/Disk.cpp
index 4df4e9d..01cd0c3 100644
--- a/model/Disk.cpp
+++ b/model/Disk.cpp
@@ -365,7 +365,6 @@
                 continue;
             }
         } else if (*it == "PART") {
-            foundParts = true;
 
             if (++it == split.end()) continue;
             int i = 0;
@@ -390,6 +389,7 @@
                     case 0x0c:  // W95 FAT32 (LBA)
                     case 0x0e:  // W95 FAT16 (LBA)
                         createPublicVolume(partDevice);
+                        foundParts = true;
                         break;
                 }
             } else if (table == Table::kGpt) {
@@ -400,8 +400,10 @@
 
                 if (android::base::EqualsIgnoreCase(typeGuid, kGptBasicData)) {
                     createPublicVolume(partDevice);
+                    foundParts = true;
                 } else if (android::base::EqualsIgnoreCase(typeGuid, kGptAndroidExpand)) {
                     createPrivateVolume(partDevice, partGuid);
+                    foundParts = true;
                 }
             }
         }