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

Commit 3468a90f authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge changes Id338f439,Ic7f50453 into main 

* changes:
  bootstat: avoid vector<const T>
  fs_mgr: avoid vector<const T>
parents 60d8d17f d8f5fd4e

bootstat/bootstat.cpp

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ int32_t BootReasonStrToEnum(const std::string& boot_reason) { 
}



// Canonical list of supported primary reboot reasons.

const std::vector<const std::string> knownReasons = {

const std::vector<std::string> knownReasons = {

    // clang-format off

    // kernel

    "watchdog",

fs_mgr/fs_mgr_overlayfs_mount.cpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ bool fs_mgr_is_dsu_running() { 
    return android::gsi::IsGsiRunning();

}



std::vector<const std::string> OverlayMountPoints() {

std::vector<std::string> OverlayMountPoints() {

    // Never fallback to legacy cache mount point if within a DSU system,

    // because running a DSU system implies the device supports dynamic

    // partitions, which means legacy cache mustn't be used.

fs_mgr/fs_mgr_overlayfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ const std::string fs_mgr_mount_point(const std::string& mount_point); 
bool OverlayfsSetupAllowed(bool verbose = false);

bool MountScratch(const std::string& device_path, bool readonly = false);

bool fs_mgr_overlayfs_umount_scratch();

std::vector<const std::string> OverlayMountPoints();

std::vector<std::string> OverlayMountPoints();

bool fs_mgr_overlayfs_already_mounted(const std::string& mount_point, bool overlay_only = true);

bool fs_mgr_wants_overlayfs(android::fs_mgr::FstabEntry* entry);

android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fstab& fstab);

fs_mgr/fs_mgr_vendor_overlay.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ namespace { 


// The order of the list means the priority to show the files in the directory.

// The last one has the highest priority.

const std::vector<const std::string> kVendorOverlaySourceDirs = {

const std::vector<std::string> kVendorOverlaySourceDirs = {

        "/system/vendor_overlay/",

        "/product/vendor_overlay/",

};