Merge "Explicitly discard released proto strings in test." am: 4a21587a87

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2239077

Change-Id: Ia5e67cda84ed3d46a8a6d0d8f1b0a67d7422d938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Krzysztof Kosiński
2022-09-30 06:01:24 +00:00
committed by Automerger Merge Worker

View File

@@ -474,8 +474,8 @@ public:
m.mutable_loader()->set_package_name("com.test"); m.mutable_loader()->set_package_name("com.test");
m.mutable_loader()->set_arguments("com.uri"); m.mutable_loader()->set_arguments("com.uri");
const auto metadata = m.SerializeAsString(); const auto metadata = m.SerializeAsString();
m.mutable_loader()->release_arguments(); static_cast<void>(m.mutable_loader()->release_arguments());
m.mutable_loader()->release_package_name(); static_cast<void>(m.mutable_loader()->release_package_name());
return {metadata.begin(), metadata.end()}; return {metadata.begin(), metadata.end()};
} }
RawMetadata getStorageMetadata(const Control& control, std::string_view path) { RawMetadata getStorageMetadata(const Control& control, std::string_view path) {
@@ -492,8 +492,8 @@ public:
bp.set_allocated_dest_path(&destPath); bp.set_allocated_dest_path(&destPath);
bp.set_allocated_source_subdir(&srcPath); bp.set_allocated_source_subdir(&srcPath);
const auto metadata = bp.SerializeAsString(); const auto metadata = bp.SerializeAsString();
bp.release_source_subdir(); static_cast<void>(bp.release_source_subdir());
bp.release_dest_path(); static_cast<void>(bp.release_dest_path());
return std::vector<char>(metadata.begin(), metadata.end()); return std::vector<char>(metadata.begin(), metadata.end());
} }
}; };