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

libsnapshot: Address GRF config when updating from Android S config

Browse source 
Bug: 333854394
Test: 1)S+U > V+V , FULL OTA pass
2)S+U > S+V, FULL OTA pass
Signed-off-by: Akilesh Kailash <akailash@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:1b76cb48ef83bceb2a5f85ec0e18f69dde9ba0ae)
Merged-In: Ia8e6db89c3395930856ace8940424e60cae92375
Change-Id: Ia8e6db89c3395930856ace8940424e60cae92375
This commit is contained in:
Akilesh Kailash 2024-07-01 10:07:43 -07:00 • committed by Android Build Coastguard Worker
parent 93096918b1
commit 689516ac96
1 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -20,6 +20,7 @@
#include <sys/file.h>
#include <sys/types.h>
#include <sys/unistd.h>
#include <sys/xattr.h>
#include <filesystem>
#include <optional>
@ -90,6 +91,8 @@ static constexpr char kBootIndicatorPath[] = "/metadata/ota/snapshot-boot";
static constexpr char kRollbackIndicatorPath[] = "/metadata/ota/rollback-indicator";
static constexpr char kSnapuserdFromSystem[] = "/metadata/ota/snapuserd-from-system";
static constexpr auto kUpdateStateCheckInterval = 2s;
static constexpr char kOtaFileContext[] = "u:object_r:ota_metadata_file:s0";
/*
* The readahead size is set to 32kb so that
* there is no significant memory pressure (/proc/pressure/memory) during boot.
@ -2134,6 +2137,24 @@ bool SnapshotManager::MarkSnapuserdFromSystem() {
PLOG(ERROR) << "Unable to write to vendor update path: " << path;
return false;
}
unique_fd fd(open(path.c_str(), O_PATH));
if (fd < 0) {
PLOG(ERROR) << "Failed to open file: " << path;
return false;
}
/*
* This function is invoked by first stage init and hence we need to
* explicitly set the correct selinux label for this file as update_engine
* will try to remove this file later on once the snapshot merge is
* complete.
*/
if (fsetxattr(fd.get(), XATTR_NAME_SELINUX, kOtaFileContext, strlen(kOtaFileContext) + 1, 0) <
0) {
PLOG(ERROR) << "fsetxattr for the path: " << path << " failed";
}
return true;
}
@ -2184,18 +2205,24 @@ bool SnapshotManager::MarkSnapuserdFromSystem() {
*
*/
bool SnapshotManager::IsLegacySnapuserdPostReboot() {
if (is_legacy_snapuserd_.has_value() && is_legacy_snapuserd_.value() == true) {
auto slot = GetCurrentSlot();
if (slot == Slot::Target) {
// If this marker is present, then daemon can handle userspace
// snapshots; also, it indicates that the vendor partition was
// updated from Android 12.
if (access(GetSnapuserdFromSystemPath().c_str(), F_OK) == 0) {
return false;
}
auto slot = GetCurrentSlot();
if (slot == Slot::Target) {
/*
If this marker is present, the daemon can handle userspace snapshots.
During post-OTA reboot, this implies that the vendor partition is
Android 13 or higher. If the snapshots were created on an
Android 12 vendor, this means the vendor partition has been updated.
*/
if (access(GetSnapuserdFromSystemPath().c_str(), F_OK) == 0) {
is_snapshot_userspace_ = true;
return false;
}
// If the marker isn't present and if the vendor is still in Android 12
if (is_legacy_snapuserd_.has_value() && is_legacy_snapuserd_.value() == true) {
return true;
}
}
return false;
}