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

Merge "Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-10 21:21:54 +00:00
committed by Android (Google) Code Review
parent 037503dfa0 015df962d5
commit 150fec445a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -2822,11 +2822,11 @@ public class BackupManagerService implements BackupManagerServiceInterface {
break;
case FINAL:
if (!mFinished) finalizeBackup();
else {
Slog.e(TAG, "Duplicate finish");
if (!mFinished) {
finalizeBackup();
} else {
Slog.e(TAG, "Duplicate finish of K/V pass");
}
mFinished = true;
break;
}
}
@@ -3180,6 +3180,7 @@ public class BackupManagerService implements BackupManagerServiceInterface {
break;
}
}
mFinished = true;
Slog.i(BackupManagerService.TAG, "K/V backup pass finished.");
// Only once we're entirely finished do we release the wakelock for k/v backup.
mWakelock.release();