commit 109111fd8b6c3bacf51afb61fa5fadc8ad8fe428
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 13:04:06 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 13:04:06 2013 -0700
tree 0373653afbbadd72b33781a8f67c222c4e312dd1
parent a999bc832d7511303c0a40e4838e3130b9bfe8ae
parent 1d5c4afa91fb2b15402a0e57f98d4b00e0a9cfc5

am 1d5c4afa: am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1d5c4afa91fb2b15402a0e57f98d4b00e0a9cfc5':

src/java/com/google/android/mms/pdu/PduComposer.java

diff --git a/src/java/com/google/android/mms/pdu/PduComposer.java b/src/java/com/google/android/mms/pdu/PduComposer.java
index d426f89..bb44bab 100644
--- a/src/java/com/google/android/mms/pdu/PduComposer.java
+++ b/src/java/com/google/android/mms/pdu/PduComposer.java
@@ -985,7 +985,7 @@
                 arraycopy(partData, 0, partData.length);
                 dataLength = partData.length;
             } else {
-                InputStream cr;
+                InputStream cr = null;
                 try {
                     byte[] buffer = new byte[PDU_COMPOSER_BLOCK_SIZE];
                     cr = mResolver.openInputStream(part.getDataUri());
@@ -1001,6 +1001,13 @@
                     return PDU_COMPOSE_CONTENT_ERROR;
                 } catch (RuntimeException e) {
                     return PDU_COMPOSE_CONTENT_ERROR;
+                } finally {
+                    if (cr != null) {
+                        try {
+                            cr.close();
+                        } catch (IOException e) {
+                        }
+                    }
                 }
             }