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

Merge "unregister FileCleanupReceiver when disableHistory"

Browse Source
This commit is contained in:
Julia Reynolds
2021-06-03 17:08:56 +00:00
committed by Gerrit Code Review
parent 37bc6b577c 52853a2d47
commit cfd9af452b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/notification/NotificationHistoryDatabase.java
View File

@@ -103,7 +103,7 @@ public class NotificationHistoryDatabase {
IntentFilter deletionFilter = new IntentFilter(ACTION_HISTORY_DELETION); IntentFilter deletionFilter = new IntentFilter(ACTION_HISTORY_DELETION);
deletionFilter.addDataScheme(SCHEME_DELETION); deletionFilter.addDataScheme(SCHEME_DELETION);
mContext.registerReceiver(mFileCleaupReceiver, deletionFilter); mContext.registerReceiver(mFileCleanupReceiver, deletionFilter);
} }
public void init() { public void init() {
@@ -329,6 +329,12 @@ public class NotificationHistoryDatabase {
} }
} }
public void unregisterFileCleanupReceiver() {
if(mContext != null) {
mContext.unregisterReceiver(mFileCleanupReceiver);
}
}
private static long safeParseLong(String fileName) { private static long safeParseLong(String fileName) {
// AtomicFile will create copies of the numeric files with ".new" and ".bak" // AtomicFile will create copies of the numeric files with ".new" and ".bak"
// over the course of its processing. If these files still exist on boot we need to clean // over the course of its processing. If these files still exist on boot we need to clean
@@ -340,7 +346,7 @@ public class NotificationHistoryDatabase {
} }
} }
private final BroadcastReceiver mFileCleaupReceiver = new BroadcastReceiver() { private final BroadcastReceiver mFileCleanupReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();

1
services/core/java/com/android/server/notification/NotificationHistoryManager.java
View File

@@ -272,6 +272,7 @@ public class NotificationHistoryManager {
private void disableHistory(NotificationHistoryDatabase userHistory, @UserIdInt int userId) { private void disableHistory(NotificationHistoryDatabase userHistory, @UserIdInt int userId) {
userHistory.disableHistory(); userHistory.disableHistory();
userHistory.unregisterFileCleanupReceiver();
mUserPendingHistoryDisables.put(userId, false); mUserPendingHistoryDisables.put(userId, false);
mHistoryEnabled.put(userId, false); mHistoryEnabled.put(userId, false);