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." into rvc-qpr-dev

Browse Source
This commit is contained in:
Trung Lam
2020-12-13 09:56:40 +00:00
committed by Android (Google) Code Review
parent c28fb42e29 0d2bc8a574
commit 0943ebe36d
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,22 +185,23 @@ 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) {
mScheduledFileDataMap.put(fileName, data); synchronized (this) {
mScheduledFileDataMap.put(fileName, data);
}
triggerScheduledFlushEarly(); triggerScheduledFlushEarly();
} }
@MainThread @MainThread
private synchronized void triggerScheduledFlushEarly() { private void triggerScheduledFlushEarly() {
if (mScheduledFileDataMap.isEmpty() || mScheduledExecutorService.isShutdown()) { synchronized (this) {
return; if (mScheduledFileDataMap.isEmpty() || mScheduledExecutorService.isShutdown()) {
} return;
// Cancel existing future. }
if (mScheduledFuture != null) { // Cancel existing future.
if (mScheduledFuture != null) {
// We shouldn't need to interrupt as this method and threaded task mScheduledFuture.cancel(true);
// #flushScheduledData are both synchronized. }
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