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

Commit 5176c025 authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

Add logs to IOExceptions during adb backup 

Test: Run adb backup
Bug: 65435587
Change-Id: I744cb2878654b716858d7c9bedeb12fb9978df6b
parent 1683efe4

cmds/bu/src/com/android/commands/bu/Backup.java

+3 −1
Original line number Diff line number Diff line
@@ -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());

                }

            }

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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.");

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

+1 −1
Original line number Diff line number Diff line
@@ -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.");

services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java

+1 −1
Original line number Diff line number Diff line
@@ -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);