ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use default dsu slot name when host is Android Q"

Browse source
This commit is contained in:
Treehugger Robot 2020-11-06 17:06:12 +00:00 • committed by Gerrit Code Review
commit 3b767c431a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs_mgr/fs_mgr_fstab.cpp
View file

@ -694,8 +694,11 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
if (!is_proc_mounts && !access(android::gsi::kGsiBootedIndicatorFile, F_OK)) {
std::string dsu_slot;
if (!android::gsi::GetActiveDsu(&dsu_slot)) {
PERROR << __FUNCTION__ << "(): failed to get active dsu slot";
return false;
// This is expected to fail if host is android Q, since Q doesn't
// support DSU slotting.
// In that case, just use the default slot name "dsu".
PWARNING << __FUNCTION__ << "(): failed to get active dsu slot";
dsu_slot = "dsu";
}
std::string lp_names;
ReadFileToString(gsi::kGsiLpNamesFile, &lp_names);