am a85a0ac1: Merge change I4413e8bc into eclair-mr2
Merge commit 'a85a0ac1072c7653fdafa791416658154b76ac0d' into eclair-mr2-plus-aosp
* commit 'a85a0ac1072c7653fdafa791416658154b76ac0d':
close file descriptors passed to drop box
diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java
index adbe930..565e50b 100644
--- a/services/java/com/android/server/BootReceiver.java
+++ b/services/java/com/android/server/BootReceiver.java
@@ -101,8 +101,9 @@
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();
}
}