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

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

Browse Source 
* commit '4bdf266c03d92448ae65ec31355588d17d179a98':
  Don't crash if a system restore fails before constructing the PMBA
This commit is contained in:
Christopher Tate
2014-12-02 00:30:40 +00:00
committed by Android Git Automerger
parent 6ec2cbd8d2 4bdf266c03
commit dac93ba27e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 // If this was a full-system restore, record the ancestral
// dataset information // dataset information
if (mIsSystemRestore) { if (mIsSystemRestore && mPmAgent != null) {
mAncestralPackages = mPmAgent.getRestoredPackages(); mAncestralPackages = mPmAgent.getRestoredPackages();
mAncestralToken = mToken; mAncestralToken = mToken;
writeRestoreTokens(); writeRestoreTokens();