Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a7d8688 authored by Michal Karpinski's avatar Michal Karpinski Committed by android-build-merger
Browse files

Merge "Eliminate a race condition that could lead to calling... 

Merge "Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice" into oc-dr1-dev am: 150fec44
am: 9ccbc854

Change-Id: I9624a73cf044bf8dce07870045b253063595c0b5
parents 41db5cf5 9ccbc854

services/backup/java/com/android/server/backup/BackupManagerService.java

+5 −4
Original line number Diff line number Diff line
@@ -2826,11 +2826,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;















                }















            }










@@ -3184,6 +3184,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();