1 files changed, 3 insertions, 88 deletions

diff --git a/fs_mgr/libsnapshot/android/snapshot/snapshot.proto b/fs_mgr/libsnapshot/android/snapshot/snapshot.proto
index de8768c71..032813279 100644
--- a/fs_mgr/libsnapshot/android/snapshot/snapshot.proto
+++ b/fs_mgr/libsnapshot/android/snapshot/snapshot.proto
@@ -34,19 +34,7 @@ enum SnapshotState {
     MERGE_COMPLETED = 3;
 }
 
-// Next: 3
-enum MergePhase {
-    // No merge is in progress.
-    NO_MERGE = 0;
-
-    // Shrunk partitions can merge.
-    FIRST_PHASE = 1;
-
-    // Grown partitions can merge.
-    SECOND_PHASE = 2;
-}
-
-// Next: 13
+// Next: 9
 message SnapshotStatus {
     // Name of the snapshot. This is usually the name of the snapshotted
     // logical partition; for example, "system_b".
@@ -96,18 +84,6 @@ message SnapshotStatus {
     // the merge process.
     // This is non-zero when |state| == MERGING or MERGE_COMPLETED.
     uint64 metadata_sectors = 8;
-
-    // True if compression is enabled, false otherwise.
-    bool compression_enabled = 9;
-
-    // The old partition size (if none existed, this will be zero).
-    uint64 old_partition_size = 10;
-
-    // Compression algorithm (none, gz, or brotli).
-    string compression_algorithm = 11;
-
-    // Estimated COW size from OTA manifest.
-    uint64 estimated_cow_size = 12;
 }
 
 // Next: 8
@@ -139,35 +115,7 @@ enum UpdateState {
     Cancelled = 7;
 };
 
-// Next 14:
-//
-// To understand the source of each failure, read snapshot.cpp. To handle new
-// sources of failure, avoid reusing an existing code; add a new code instead.
-enum MergeFailureCode {
-    Ok = 0;
-    ReadStatus = 1;
-    GetTableInfo = 2;
-    UnknownTable = 3;
-    GetTableParams = 4;
-    ActivateNewTable = 5;
-    AcquireLock = 6;
-    ListSnapshots = 7;
-    WriteStatus = 8;
-    UnknownTargetType = 9;
-    QuerySnapshotStatus = 10;
-    ExpectedMergeTarget = 11;
-    UnmergedSectorsAfterCompletion = 12;
-    UnexpectedMergeState = 13;
-    GetCowPathConsistencyCheck = 14;
-    OpenCowConsistencyCheck = 15;
-    ParseCowConsistencyCheck = 16;
-    OpenCowDirectConsistencyCheck = 17;
-    MemAlignConsistencyCheck = 18;
-    DirectReadConsistencyCheck = 19;
-    WrongMergeCountConsistencyCheck = 20;
-};
-
-// Next: 8
+// Next: 5
 message SnapshotUpdateStatus {
     UpdateState state = 1;
 
@@ -182,21 +130,9 @@ message SnapshotUpdateStatus {
 
     // Sectors allocated for metadata in all the snapshot devices.
     uint64 metadata_sectors = 4;
-
-    // Whether compression/dm-user was used for any snapshots.
-    bool compression_enabled = 5;
-
-    // Merge phase (if state == MERGING).
-    MergePhase merge_phase = 6;
-
-    // Merge failure code, filled if state == MergeFailed.
-    MergeFailureCode merge_failure_code = 7;
-
-    // Source build fingerprint.
-    string source_build_fingerprint = 8;
 }
 
-// Next: 10
+// Next: 4
 message SnapshotMergeReport {
     // Status of the update after the merge attempts.
     UpdateState state = 1;
@@ -207,25 +143,4 @@ message SnapshotMergeReport {
 
     // Total size of all the COW images before the update.
     uint64 cow_file_size = 3;
-
-    // Whether compression/dm-user was used for any snapshots.
-    bool compression_enabled = 4;
-
-    // Total size used by COWs, including /data and the super partition.
-    uint64 total_cow_size_bytes = 5;
-
-    // Sum of the estimated COW fields in the OTA manifest.
-    uint64 estimated_cow_size_bytes = 6;
-
-    // Time from boot to sys.boot_completed, in milliseconds.
-    uint32 boot_complete_time_ms = 7;
-
-    // Time from sys.boot_completed to merge start, in milliseconds.
-    uint32 boot_complete_to_merge_start_time_ms = 8;
-
-    // Merge failure code, filled if state == MergeFailed.
-    MergeFailureCode merge_failure_code = 9;
-
-    // The source fingerprint at the time the OTA was downloaded.
-    string source_build_fingerprint = 10;
 }