Merge change I4413e8bc into eclair-mr2

* changes: close file descriptors passed to drop box
2009-11-25 11:54:17 -08:00
parent 30348b0de1 4413e8bc4c
commit a85a0ac107
1 changed files with 4 additions and 3 deletions
--- a/services/java/com/android/server/BootReceiver.java
+++ b/services/java/com/android/server/BootReceiver.java
@@ -101,8 +101,9 @@ public class BootReceiver extends BroadcastReceiver {
        long lastTime = Settings.Secure.getLong(cr, setting, 0);
        if (lastTime == fileTime) return;  // Already logged this particular file

-        db.addFile(tag,
-                ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY),
-                DropBoxManager.IS_TEXT);
+        ParcelFileDescriptor pfd =
+            ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+        db.addFile(tag, pfd, DropBoxManager.IS_TEXT);
+        pfd.close();
    }
 }