| commit | 227254f61602eab532727d3d968dabba9653b0dc | [log] [tgz] |
|---|---|---|
| author | mingwei xue <mingwei.xue@transsion.corp-partner.google.com> | Thu Aug 08 03:38:57 2024 +0000 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Fri Aug 09 19:04:14 2024 +0000 |
| tree | ac4e8f4aa2c0bfe774e4a8c7ba8199ea2137cb16 | |
| parent | 77d388f2858357f4d5229878c3e8f9ce0a359984 [diff] |
Fix SnapshotTest crash For Android 12 vendor project, SnapshotTestEnvironment setup is skipped. So, test_device is not initialized, which will cause other tests to fail. BUG:350678717 Test:run vts -m vts_libsnapshot_test (cherry picked from https://android-review.googlesource.com/q/commit:a791e913048801a2a74beaea42b992c380eb8c2c) Merged-In: I6ce6a9e7ea2c210e25c2a5ffadaaa6348086ea7f Change-Id: I6ce6a9e7ea2c210e25c2a5ffadaaa6348086ea7f
diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp index 07f1301..bf16b0f 100644 --- a/fs_mgr/libsnapshot/snapshot_test.cpp +++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -2837,7 +2837,6 @@ // 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