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

Commit 1dfaa756 authored by Krzysztof Kosiński's avatar Krzysztof Kosiński Committed by Automerger Merge Worker
Browse files

Merge "Explicitly discard released proto strings." am: 5df912d6 am: fac256f5 

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



Change-Id: Id8ddcb294c5fbccab439a0d9ddda81391387350f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71db43c5 fac256f5

services/incremental/IncrementalService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1287,8 +1287,8 @@ int IncrementalService::addBindMount(IncFsMount& ifs, StorageId storage, 
        bp.set_allocated_dest_path(&target);

        bp.set_allocated_source_subdir(&source);

        const auto metadata = bp.SerializeAsString();

        bp.release_dest_path();

        bp.release_source_subdir();

        static_cast<void>(bp.release_dest_path());

        static_cast<void>(bp.release_source_subdir());

        mdFileName = makeBindMdName();

        metadataFullPath = path::join(ifs.root, constants().mount, mdFileName);

        auto node = mIncFs->makeFile(ifs.control, metadataFullPath, 0444, idFromMetadata(metadata),