ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "base: TemporaryDir add DoNotRemove() method"

Browse source
This commit is contained in:
Treehugger Robot 2018-11-15 00:37:03 +00:00 • committed by Gerrit Code Review
commit 2979d385cb
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/file.cpp
View file

@ -134,6 +134,8 @@ TemporaryDir::TemporaryDir() {
}
TemporaryDir::~TemporaryDir() {
if (!remove_dir_and_contents_) return;
auto callback = [](const char* child, const struct stat*, int file_type, struct FTW*) -> int {
switch (file_type) {
case FTW_D:

4
base/include/android-base/file.h
View file

@ -61,12 +61,16 @@ class TemporaryDir {
public:
TemporaryDir();
~TemporaryDir();
// Don't remove the temporary dir in the destructor.
void DoNotRemove() { remove_dir_and_contents_ = false; }
char path[1024];
private:
bool init(const std::string& tmp_dir);
bool remove_dir_and_contents_ = true;
DISALLOW_COPY_AND_ASSIGN(TemporaryDir);
};