Merge "libsnapshot: Enable snapshots during OTA install for S vendor" into main (ad55fad0) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapshot.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -3288,8 +3288,11 @@ Return SnapshotManager::CreateUpdateSnapshots(const DeltaArchiveManifest& manife
		}
		}

		LOG(INFO) << "userspace snapshots: " << userspace_snapshots
		<< " legacy_snapuserd: " << legacy_compression;
		if (!userspace_snapshots && is_legacy_snapuserd && legacy_compression) {
		userspace_snapshots = true;
		LOG(INFO) << "Vendor from Android 12. Enabling userspace snapshot for OTA install";
		}

		const bool using_snapuserd = userspace_snapshots \|\| legacy_compression;
		if (!using_snapuserd) {
		LOG(INFO) << "Using legacy Virtual A/B (dm-snapshot)";
		@@ -3389,6 +3392,7 @@ Return SnapshotManager::CreateUpdateSnapshots(const DeltaArchiveManifest& manife
		}

		if (is_legacy_snapuserd) {
		LOG(INFO) << "Setting legacy_snapuserd to true";
		status.set_legacy_snapuserd(true);
		}
		} else if (legacy_compression) {