Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Explicitly discard released proto strings." am: 5df912d6f5 am: fac256f532 am: 1dfaa7569f

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

Change-Id: I6f736386861cc5a7522887466b1cca2080ff3d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Krzysztof Kosiński
2022-09-28 07:16:58 +00:00
committed by Automerger Merge Worker
parent 419f137b85 1dfaa7569f
commit c7f43f9796
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/incremental/IncrementalService.cpp
View File

@@ -1287,8 +1287,8 @@ int IncrementalService::addBindMount(IncFsMount& ifs, StorageId storage,
bp.set_allocated_dest_path(&target); bp.set_allocated_dest_path(&target);
bp.set_allocated_source_subdir(&source); bp.set_allocated_source_subdir(&source);
const auto metadata = bp.SerializeAsString(); const auto metadata = bp.SerializeAsString();
bp.release_dest_path(); static_cast<void>(bp.release_dest_path());
bp.release_source_subdir(); static_cast<void>(bp.release_source_subdir());
mdFileName = makeBindMdName(); mdFileName = makeBindMdName();
metadataFullPath = path::join(ifs.root, constants().mount, mdFileName); metadataFullPath = path::join(ifs.root, constants().mount, mdFileName);
auto node = mIncFs->makeFile(ifs.control, metadataFullPath, 0444, idFromMetadata(metadata), auto node = mIncFs->makeFile(ifs.control, metadataFullPath, 0444, idFromMetadata(metadata),