Stopped closing State FDs in AccountSyncSettingsBackupHelper

Stopped closing oldState and newState FDs in
AccountSyncSettingsBackupHelper so that other backups that
follow don't fail.

Bug: 26290952
Change-Id: I10f2ad699207bac8b25b47293252510e7a438b76

1 files changed, 5 insertions, 3 deletions

diff --git a/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java b/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java
index c0215a8011ee..0449340ea21a 100644
--- a/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java
+++ b/core/java/com/android/server/backup/AccountSyncSettingsBackupHelper.java
@@ -203,9 +203,8 @@ public class AccountSyncSettingsBackupHelper implements BackupHelper {
             }
         } catch (EOFException eof) {
             // Initial state may be empty.
-        } finally {
-            dataInput.close();
         }
+        // We explicitly don't close 'dataInput' because we must not close the backing fd.
         return oldMd5Checksum;
     }
 
@@ -219,7 +218,10 @@ public class AccountSyncSettingsBackupHelper implements BackupHelper {
 
         dataOutput.writeInt(STATE_VERSION);
         dataOutput.write(md5Checksum);
-        dataOutput.close();
+
+        // We explicitly don't close 'dataOutput' because we must not close the backing fd.
+        // The FileOutputStream will not close it implicitly.
+
     }
 
     private byte[] generateMd5Checksum(byte[] data) throws NoSuchAlgorithmException {