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

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

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

Merge "Explicitly discard released proto strings in test." am: 4a21587a am: f429f137 am: c2695ffa

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



Change-Id: I28b35515c4fd0d40578f4d2aabd87df0bafa5d23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca4cbcc5 c2695ffa

services/incremental/test/IncrementalServiceTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ public: 
        m.mutable_loader()->set_package_name("com.test");

        m.mutable_loader()->set_arguments("com.uri");

        const auto metadata = m.SerializeAsString();

        m.mutable_loader()->release_arguments();

        m.mutable_loader()->release_package_name();

        static_cast<void>(m.mutable_loader()->release_arguments());

        static_cast<void>(m.mutable_loader()->release_package_name());

        return {metadata.begin(), metadata.end()};

    }

    RawMetadata getStorageMetadata(const Control& control, std::string_view path) {
@@ -492,8 +492,8 @@ public: 
        bp.set_allocated_dest_path(&destPath);

        bp.set_allocated_source_subdir(&srcPath);

        const auto metadata = bp.SerializeAsString();

        bp.release_source_subdir();

        bp.release_dest_path();

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

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

        return std::vector<char>(metadata.begin(), metadata.end());

    }

};