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

Merge changes Id338f439,Ic7f50453 into main

Browse source 
* changes:
  bootstat: avoid vector<const T>
  fs_mgr: avoid vector<const T>
This commit is contained in:
Ryan Prichard 2024-07-12 00:47:42 +00:00 • committed by Gerrit Code Review
commit 3468a90f47
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstat/bootstat.cpp
View file

@ -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",

2
fs_mgr/fs_mgr_overlayfs_mount.cpp
View file

@ -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.

2
fs_mgr/fs_mgr_overlayfs_mount.h
View file

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

2
fs_mgr/fs_mgr_vendor_overlay.cpp
View file

@ -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/",
};