am 9b150b74: Close the cursor before assigning a new one to the same variable.

Merge commit '9b150b74573ce506abd00c692fb42f46980441a3' into eclair-plus-aosp

* commit '9b150b74573ce506abd00c692fb42f46980441a3':
  Close the cursor before assigning a new one to the same variable.

core/java/android/provider/MediaStore.java

@@ -345,6 +345,7 @@ public final class MediaStore {
                             baseUri.buildUpon().appendPath(String.valueOf(origId))
                                     .toString().replaceFirst("thumbnails", "media"));
                     if (filePath == null) {
+                        if (c != null) c.close();
                         c = cr.query(uri, PROJECTION, null, null, null);
                         if (c == null || !c.moveToFirst()) {
                             return null;