[automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-qpr1-dev am: 3b92281e2f -s ours am: 6fe136b92b -s ours am: 186d0d0fec -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167
Change-Id: Ieb1163481fda95d0cec8b91d69bf48e19393ed42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libdm/dm_test.cpp b/fs_mgr/libdm/dm_test.cpp
index f4c9784..541f254 100644
--- a/fs_mgr/libdm/dm_test.cpp
+++ b/fs_mgr/libdm/dm_test.cpp
@@ -690,32 +690,3 @@
// Empty device should be in suspended state.
ASSERT_EQ(DmDeviceState::SUSPENDED, dm.GetState("empty-device"));
}
-
-TEST(libdm, RedactDmCrypt) {
- static constexpr uint64_t kImageSize = 65536;
- static constexpr const char* kTestName = "RedactDmCrypt";
- unique_fd temp_file(CreateTempFile("file_1", kImageSize));
- ASSERT_GE(temp_file, 0);
-
- LoopDevice loop(temp_file, 10s);
- ASSERT_TRUE(loop.valid());
-
- static constexpr const char* kAlgorithm = "aes-cbc-essiv:sha256";
- static constexpr const char* kKey = "0e64ef514e6a1315b1f6390cb57c9e6a";
-
- auto target = std::make_unique<DmTargetCrypt>(0, kImageSize / 512, kAlgorithm, kKey, 0,
- loop.device(), 0);
- target->AllowDiscards();
-
- DmTable table;
- table.AddTarget(std::move(target));
-
- auto& dm = DeviceMapper::Instance();
- std::string crypt_path;
- ASSERT_TRUE(dm.CreateDevice(kTestName, table, &crypt_path, 10s));
-
- std::vector<DeviceMapper::TargetInfo> targets;
- ASSERT_TRUE(dm.GetTableInfo(kTestName, &targets));
- ASSERT_EQ(targets.size(), 1);
- EXPECT_EQ(targets[0].data.find(kKey), std::string::npos);
-}
diff --git a/libstats/pull_rust/Android.bp b/libstats/pull_rust/Android.bp
index 4ffa98d..cc9f5b4 100644
--- a/libstats/pull_rust/Android.bp
+++ b/libstats/pull_rust/Android.bp
@@ -47,6 +47,7 @@
min_sdk_version: "apex_inherit",
apex_available: [
"//apex_available:platform",
+ "com.android.resolv",
"com.android.virt",
]
}