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

Merge "Don't call BackupTransport#checkFullBackupSize when preflight timeouted."

Browse Source
This commit is contained in:
Sergey Poromov
2016-02-11 13:09:54 +00:00
committed by Android (Google) Code Review
parent 0f34e363fc a235f7e4e0
commit f75b7a27f5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3494,7 +3494,7 @@ public class BackupManagerService {
*/
int preflightFullBackup(PackageInfo pkg, IBackupAgent agent);
long expectedSize();
long getExpectedSizeOrErrorCode();
};
class FullBackupEngine {
@@ -4555,6 +4555,10 @@ public class BackupManagerService {
// now wait to get our result back
mLatch.await();
int totalSize = mResult.get();
// If preflight timeouted, mResult will contain error code.
if (totalSize < 0) {
return totalSize;
}
if (MORE_DEBUG) {
Slog.v(TAG, "Got preflight response; size=" + totalSize);
}
@@ -4600,7 +4604,7 @@ public class BackupManagerService {
}
@Override
public long expectedSize() {
public long getExpectedSizeOrErrorCode() {
try {
mLatch.await();
return mResult.get();
@@ -4649,7 +4653,7 @@ public class BackupManagerService {
}
long expectedSize() {
return mPreflight.expectedSize();
return mPreflight.getExpectedSizeOrErrorCode();
}
}
}