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

Merge "Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd1f am: b5fe464ea0 am: e6759f8e13 am: 092cb4f41a" into rvc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-03-04 18:05:02 +00:00
committed by Android (Google) Code Review
parent 206528870e 48c1aaa6f3
commit 09057f8a68
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/notification/NotificationDelegate.java
View File

@@ -87,4 +87,6 @@ public interface NotificationDelegate {
*/
void onNotificationSmartReplySent(String key, int clickedIndex, CharSequence reply,
int notificationLocation, boolean modifiedBeforeSending);
void prepareForPossibleShutdown();
}

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

@@ -157,9 +157,7 @@ public class NotificationHistoryDatabase {
}
public void forceWriteToDisk() {
if (!mFileWriteHandler.hasCallbacks(mWriteBufferRunnable)) {
mFileWriteHandler.post(mWriteBufferRunnable);
}
mFileWriteHandler.post(mWriteBufferRunnable);
}
public void onPackageRemoved(String packageName) {

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

@@ -181,7 +181,6 @@ public class NotificationHistoryManager {
}
}
// TODO: wire this up to AMS when power button is long pressed
public void triggerWriteToDisk() {
synchronized (mLock) {
final int userCount = mUserState.size();

5
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -875,6 +875,11 @@ public class NotificationManagerService extends SystemService {
@VisibleForTesting
final NotificationDelegate mNotificationDelegate = new NotificationDelegate() {
@Override
public void prepareForPossibleShutdown() {
mHistoryManager.triggerWriteToDisk();
}
@Override
public void onSetDisabled(int status) {
synchronized (mNotificationLock) {

2
services/core/java/com/android/server/statusbar/StatusBarManagerService.java
View File

@@ -1169,6 +1169,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D
enforceStatusBarService();
long identity = Binder.clearCallingIdentity();
try {
mNotificationDelegate.prepareForPossibleShutdown();
// ShutdownThread displays UI, so give it a UI context.
mHandler.post(() ->
ShutdownThread.shutdown(getUiContext(),
@@ -1186,6 +1187,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D
enforceStatusBarService();
long identity = Binder.clearCallingIdentity();
try {
mNotificationDelegate.prepareForPossibleShutdown();
mHandler.post(() -> {
// ShutdownThread displays UI, so give it a UI context.
if (safeMode) {

4
services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java
View File

@@ -162,10 +162,10 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
}
@Test
public void testOnlyOneWriteRunnableInQueue() {
public void testForceWriteToDisk_bypassesExistingWrites() {
when(mFileWriteHandler.hasCallbacks(any())).thenReturn(true);
mDataBase.forceWriteToDisk();
verify(mFileWriteHandler, never()).post(any());
verify(mFileWriteHandler, times(1)).post(any());
}
@Test