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

Browse Source
This commit is contained in:
Trung Lam
2020-03-02 19:31:56 +00:00
committed by Android (Google) Code Review
parent a23db05da5 070b71cfa4
commit d28d403f8f
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.Nullable;
import android.annotation.WorkerThread; import android.annotation.WorkerThread;
import android.net.Uri; import android.net.Uri;
import android.os.FileUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Slog; import android.util.Slog;
@@ -55,6 +56,7 @@ class EventHistoryImpl implements EventHistory {
private final ScheduledExecutorService mScheduledExecutorService; private final ScheduledExecutorService mScheduledExecutorService;
private final EventsProtoDiskReadWriter mEventsProtoDiskReadWriter; private final EventsProtoDiskReadWriter mEventsProtoDiskReadWriter;
private final EventIndexesProtoDiskReadWriter mEventIndexesProtoDiskReadWriter; private final EventIndexesProtoDiskReadWriter mEventIndexesProtoDiskReadWriter;
private final File mRootDir;
// Event Type -> Event Index // Event Type -> Event Index
@GuardedBy("this") @GuardedBy("this")
@@ -77,10 +79,11 @@ class EventHistoryImpl implements EventHistory {
mScheduledExecutorService = scheduledExecutorService; mScheduledExecutorService = scheduledExecutorService;
mLastPruneTime = injector.currentTimeMillis(); mLastPruneTime = injector.currentTimeMillis();
File eventsDir = new File(rootDir, EVENTS_DIR); mRootDir = rootDir;
File eventsDir = new File(mRootDir, EVENTS_DIR);
mEventsProtoDiskReadWriter = new EventsProtoDiskReadWriter(eventsDir, mEventsProtoDiskReadWriter = new EventsProtoDiskReadWriter(eventsDir,
mScheduledExecutorService); mScheduledExecutorService);
File indexesDir = new File(rootDir, INDEXES_DIR); File indexesDir = new File(mRootDir, INDEXES_DIR);
mEventIndexesProtoDiskReadWriter = new EventIndexesProtoDiskReadWriter(indexesDir, mEventIndexesProtoDiskReadWriter = new EventIndexesProtoDiskReadWriter(indexesDir,
scheduledExecutorService); scheduledExecutorService);
} }
@@ -188,6 +191,7 @@ class EventHistoryImpl implements EventHistory {
mRecentEvents.clear(); mRecentEvents.clear();
mEventsProtoDiskReadWriter.deleteRecentEventsFile(); mEventsProtoDiskReadWriter.deleteRecentEventsFile();
mEventIndexesProtoDiskReadWriter.deleteIndexesFile(); mEventIndexesProtoDiskReadWriter.deleteIndexesFile();
FileUtils.deleteContentsAndDir(mRootDir);
} }
/** Deletes the events data that exceeds the retention period. */ /** Deletes the events data that exceeds the retention period. */