Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b445a012 authored by Yo Chiang's avatar Yo Chiang
Browse files

Use default dsu slot name when host is Android Q 

DSU slotting support is added in Android R, so
android::gsi::GetActiveDsu() is guaranteed to fail if DSU guest system
is S and host is Q.
In that case, just assume the the DSU slot to be "dsu".

Bug: 172541102
Bug: 168571434
Test: Boot GSI S on Q pixel with DSU
Change-Id: I96e191907ce2fedf8c22b7887e930a7c455eb593
parent 56850e12

fs_mgr/fs_mgr_fstab.cpp

+5 −2
Original line number Diff line number Diff line
@@ -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);