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

Merge "Add logs to IOExceptions during adb backup" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-14 13:53:49 +00:00
committed by Android (Google) Code Review
parent 0f016f00c4 628fee52b1
commit 786354a53f
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/bu/src/com/android/commands/bu/Backup.java
View File

@@ -136,7 +136,9 @@ public final class Backup {
if (fd != null) {
try {
fd.close();
} catch (IOException e) {}
} catch (IOException e) {
Log.e(TAG, "IO error closing output for backup: " + e.getMessage());
}
}
}
}

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

@@ -4535,7 +4535,7 @@ public class BackupManagerService implements BackupManagerServiceInterface {
}
mOutputFile.close();
} catch (IOException e) {
/* nothing we can do about this */
Slog.e(TAG, "IO error closing adb backup file: " + e.getMessage());
}
synchronized (mLatch) {
mLatch.set(true);
@@ -10112,7 +10112,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
try {
fd.close();
} catch (IOException e) {
// just eat it
Slog.e(TAG, "IO error closing output for adb backup: " + e.getMessage());
}
Binder.restoreCallingIdentity(oldId);
Slog.d(TAG, "Adb backup processing complete.");

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

@@ -2486,7 +2486,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter
try {
fd.close();
} catch (IOException e) {
// just eat it
Slog.e(TAG, "IO error closing output for adb backup: " + e.getMessage());
}
Binder.restoreCallingIdentity(oldId);
Slog.d(TAG, "Adb backup processing complete.");

2
services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
View File

@@ -459,7 +459,7 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor
}
mOutputFile.close();
} catch (IOException e) {
/* nothing we can do about this */
Slog.e(TAG, "IO error closing adb backup file: " + e.getMessage());
}
synchronized (mLatch) {
mLatch.set(true);