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

Commit 11bac0ed authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup... 

am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev

* commit '61737d81':
  Eliminate race condition around backup completion + resumption
parents 6f0c3f1a 61737d81

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

+4 −1
Original line number Diff line number Diff line
@@ -2855,9 +2855,12 @@ public class BackupManagerService extends IBackupManager.Stub { 
            try { if (mSavedState != null) mSavedState.close(); } catch (IOException e) {}

            try { if (mBackupData != null) mBackupData.close(); } catch (IOException e) {}

            try { if (mNewState != null) mNewState.close(); } catch (IOException e) {}

            mSavedState = mBackupData = mNewState = null;

            synchronized (mCurrentOpLock) {

                // Current-operation callback handling requires the validity of these various

                // bits of internal state as an invariant of the operation still being live.

                // This means we make sure to clear all of the state in unison inside the lock.

                mCurrentOperations.clear();

                mSavedState = mBackupData = mNewState = null;

            }



            // If this was a pseudopackage there's no associated Activity Manager state