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

Merge "[zip] Make implementations of zip interfaces final"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-15 02:37:03 +00:00
committed by Gerrit Code Review
parent 94f5f44bff 27038bc754
commit d0329c51d3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/androidfw/ZipUtils.cpp
View File

@@ -35,7 +35,7 @@
using namespace android; using namespace android;
// TODO: This can go away once the only remaining usage in aapt goes away. // TODO: This can go away once the only remaining usage in aapt goes away.
class FileReader : public zip_archive::Reader { class FileReader final : public zip_archive::Reader {
public: public:
explicit FileReader(FILE* fp) : Reader(), mFp(fp), mCurrentOffset(0) { explicit FileReader(FILE* fp) : Reader(), mFp(fp), mCurrentOffset(0) {
} }
@@ -66,7 +66,7 @@ class FileReader : public zip_archive::Reader {
mutable off64_t mCurrentOffset; mutable off64_t mCurrentOffset;
}; };
class FdReader : public zip_archive::Reader { class FdReader final : public zip_archive::Reader {
public: public:
explicit FdReader(int fd) : mFd(fd) { explicit FdReader(int fd) : mFd(fd) {
} }
@@ -79,7 +79,7 @@ class FdReader : public zip_archive::Reader {
const int mFd; const int mFd;
}; };
class BufferReader : public zip_archive::Reader { class BufferReader final : public zip_archive::Reader {
public: public:
BufferReader(incfs::map_ptr<void> input, size_t inputSize) : Reader(), BufferReader(incfs::map_ptr<void> input, size_t inputSize) : Reader(),
mInput(input.convert<uint8_t>()), mInput(input.convert<uint8_t>()),
@@ -105,7 +105,7 @@ class BufferReader : public zip_archive::Reader {
const size_t mInputSize; const size_t mInputSize;
}; };
class BufferWriter : public zip_archive::Writer { class BufferWriter final : public zip_archive::Writer {
public: public:
BufferWriter(void* output, size_t outputSize) : Writer(), BufferWriter(void* output, size_t outputSize) : Writer(),
mOutput(reinterpret_cast<uint8_t*>(output)), mOutputSize(outputSize), mBytesWritten(0) { mOutput(reinterpret_cast<uint8_t*>(output)), mOutputSize(outputSize), mBytesWritten(0) {