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

Commit c05ddd33 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove invalid error message in the merge path." am: 3ce24b87 am: 104ee86e 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1573320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6592eb5e3b1df72bbefbe0d40fd7b8de7129e37
parents d088e15e 104ee86e

fs_mgr/libsnapshot/snapuserd.cpp

+0 −2
Original line number Diff line number Diff line
@@ -391,8 +391,6 @@ int Snapuserd::GetNumberOfMergedOps(void* merged_buffer, void* unmerged_buffer, 
    }



    if (*copy_op) {

        SNAP_LOG(ERROR) << "Invalid batch merge of copy ops: merged_ops_cur_iter: "

                        << merged_ops_cur_iter;

        CHECK(merged_ops_cur_iter == 1);

    }

    return merged_ops_cur_iter;