summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bernardo Rufino <brufino@google.com> 2017-09-13 12:53:34 +0100
committer Bernardo Rufino <brufino@google.com> 2017-09-13 14:10:20 +0100
commit5176c02501054da21d2729339037c66416c09528 (patch)
treeb3c7d165a93e09be239cf49cd085e632385f689a
parent1683efe4eca1bc6e9ebb9fe9b9997dc608354e9b (diff)
Add logs to IOExceptions during adb backup
Test: Run adb backup Bug: 65435587 Change-Id: I744cb2878654b716858d7c9bedeb12fb9978df6b
-rw-r--r--cmds/bu/src/com/android/commands/bu/Backup.java4
-rw-r--r--services/backup/java/com/android/server/backup/BackupManagerService.java4
-rw-r--r--services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java2
-rw-r--r--services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java2
4 files changed, 7 insertions, 5 deletions
diff --git a/cmds/bu/src/com/android/commands/bu/Backup.java b/cmds/bu/src/com/android/commands/bu/Backup.java
index 345895b794a3..834658da8ccc 100644
--- a/cmds/bu/src/com/android/commands/bu/Backup.java
+++ b/cmds/bu/src/com/android/commands/bu/Backup.java
@@ -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());
+ }
}
}
}
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index d2f8bacef5f2..2a2e1fbade5d 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -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.");
diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java
index b6e3f0f4f19e..9e8ec64d024f 100644
--- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java
@@ -2396,7 +2396,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.");
diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
index 804e92c88eb7..4085f63afa8c 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
@@ -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);