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

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

Merge "Fix SnapshotTest crash" into main am: a7f7f406 am: b1031d93 

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



Change-Id: I76c4217ec96322872857916798c756638d7c847b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ce193e0 b1031d93

fs_mgr/libsnapshot/snapshot_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,6 @@ void SnapshotTestEnvironment::SetUp() { 
    // that is fixed, don't call GTEST_SKIP here, but instead call GTEST_SKIP in individual test

    // suites.

    RETURN_IF_NON_VIRTUAL_AB_MSG("Virtual A/B is not enabled, skipping global setup.\n");

    RETURN_IF_VENDOR_ON_ANDROID_S_MSG("Test not enabled for Vendor on Android S.\n");



    std::vector<std::string> paths = {

            // clang-format off