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

Merge "Fix events/<key> folders not being deleted during onDestory." into rvc-dev am: d28d403f8f

Browse Source 
Change-Id: I2ff7f7feb7738f8b259409fe6b4d8970b889903c
This commit is contained in:
Automerger Merge Worker
2020-03-02 19:33:22 +00:00
parent 96da6251b2 d28d403f8f
commit cfdc90b422
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/people/java/com/android/server/people/data/EventHistoryImpl.java
View File

@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.WorkerThread;
import android.net.Uri;
import android.os.FileUtils;
import android.text.format.DateUtils;
import android.util.ArrayMap;
import android.util.Slog;
@@ -55,6 +56,7 @@ class EventHistoryImpl implements EventHistory {
private final ScheduledExecutorService mScheduledExecutorService;
private final EventsProtoDiskReadWriter mEventsProtoDiskReadWriter;
private final EventIndexesProtoDiskReadWriter mEventIndexesProtoDiskReadWriter;
private final File mRootDir;
// Event Type -> Event Index
@GuardedBy("this")
@@ -77,10 +79,11 @@ class EventHistoryImpl implements EventHistory {
mScheduledExecutorService = scheduledExecutorService;
mLastPruneTime = injector.currentTimeMillis();
File eventsDir = new File(rootDir, EVENTS_DIR);
mRootDir = rootDir;
File eventsDir = new File(mRootDir, EVENTS_DIR);
mEventsProtoDiskReadWriter = new EventsProtoDiskReadWriter(eventsDir,
mScheduledExecutorService);
File indexesDir = new File(rootDir, INDEXES_DIR);
File indexesDir = new File(mRootDir, INDEXES_DIR);
mEventIndexesProtoDiskReadWriter = new EventIndexesProtoDiskReadWriter(indexesDir,
scheduledExecutorService);
}
@@ -188,6 +191,7 @@ class EventHistoryImpl implements EventHistory {
mRecentEvents.clear();
mEventsProtoDiskReadWriter.deleteRecentEventsFile();
mEventIndexesProtoDiskReadWriter.deleteIndexesFile();
FileUtils.deleteContentsAndDir(mRootDir);
}
/** Deletes the events data that exceeds the retention period. */