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

Commit 004d45a9 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Delete files properly when history disabled 

Delete the files, then the directory

Test: turn history off, check folder on device
Bug: 137396965
Change-Id: Ic69adf6d08219cab186c131147192f5d1ea1ee91
parent e6fed50a

services/core/java/com/android/server/notification/NotificationHistoryDatabase.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -231,6 +231,9 @@ public class NotificationHistoryDatabase { 




    public void disableHistory() {

    public void disableHistory() {

        synchronized (mLock) {

        synchronized (mLock) {

            for (AtomicFile file : mHistoryFiles) {

                file.delete();

            }

            mHistoryDir.delete();

            mHistoryDir.delete();

            mHistoryFiles.clear();

            mHistoryFiles.clear();

        }

        }
@@ -249,6 +252,10 @@ public class NotificationHistoryDatabase { 
                final AtomicFile currentOldestFile = mHistoryFiles.get(i);

                final AtomicFile currentOldestFile = mHistoryFiles.get(i);

                final long creationTime =

                final long creationTime =

                        mFileAttrProvider.getCreationTime(currentOldestFile.getBaseFile());

                        mFileAttrProvider.getCreationTime(currentOldestFile.getBaseFile());

                if (DEBUG) {

                    Slog.d(TAG, "Pruning " + currentOldestFile.getBaseFile().getName()

                            + " created on " + creationTime);

                }

                if (creationTime <= retentionBoundary.getTimeInMillis()) {

                if (creationTime <= retentionBoundary.getTimeInMillis()) {

                    if (DEBUG) {

                    if (DEBUG) {

                        Slog.d(TAG, "Removed " + currentOldestFile.getBaseFile().getName());

                        Slog.d(TAG, "Removed " + currentOldestFile.getBaseFile().getName());