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

Commit 4bdf266c authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing... 

am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev

* commit 'c70fc4a3':
  Don't crash if a system restore fails before constructing the PMBA
parents 1d22f99d c70fc4a3

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

+1 −1
Original line number Diff line number Diff line
@@ -7664,7 +7664,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 


            // If this was a full-system restore, record the ancestral

            // dataset information

            if (mIsSystemRestore) {

            if (mIsSystemRestore && mPmAgent != null) {

                mAncestralPackages = mPmAgent.getRestoredPackages();

                mAncestralToken = mToken;

                writeRestoreTokens();