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

Merge "Fix issue with saving protos to disk during shutdown." am: 68e0de029a am: 26fcba8c97 am: 32d142933e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492076

Change-Id: I49f5241d403b5f2b959a2967612e0c5790076c29
This commit is contained in:
Trung Lam
2020-11-10 06:50:31 +00:00
committed by Automerger Merge Worker
parent 9a0675c3dd 32d142933e
commit 043ebe229e
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/people/java/com/android/server/people/data/AbstractProtoDiskReadWriter.java
View File

@@ -185,23 +185,24 @@ abstract class AbstractProtoDiskReadWriter<T> {
* is useful for when device is powering off. * is useful for when device is powering off.
*/ */
@MainThread @MainThread
synchronized void saveImmediately(@NonNull String fileName, @NonNull T data) { void saveImmediately(@NonNull String fileName, @NonNull T data) {
synchronized (this) {
mScheduledFileDataMap.put(fileName, data); mScheduledFileDataMap.put(fileName, data);
}
triggerScheduledFlushEarly(); triggerScheduledFlushEarly();
} }
@MainThread @MainThread
private synchronized void triggerScheduledFlushEarly() { private void triggerScheduledFlushEarly() {
synchronized (this) {
if (mScheduledFileDataMap.isEmpty() || mScheduledExecutorService.isShutdown()) { if (mScheduledFileDataMap.isEmpty() || mScheduledExecutorService.isShutdown()) {
return; return;
} }
// Cancel existing future. // Cancel existing future.
if (mScheduledFuture != null) { if (mScheduledFuture != null) {
// We shouldn't need to interrupt as this method and threaded task
// #flushScheduledData are both synchronized.
mScheduledFuture.cancel(true); mScheduledFuture.cancel(true);
} }
}
// Submit flush and blocks until it completes. Blocking will prevent the device from // Submit flush and blocks until it completes. Blocking will prevent the device from
// shutting down before flushing completes. // shutting down before flushing completes.