Close open cursors

Cursors which got created during any query, needs to be closed
finally. Otherwise it'll cause leak in resource and cursor window
allocation will fail.

Change-Id: I65ace2dc227e0a50c163faba13fdb0fbfa71bc6c
CRs-Fixed: 594264

2 files changed, 4 insertions, 0 deletions

diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 5744d6b96..77e665191 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -153,6 +153,7 @@ public class CameraDataAdapter implements LocalDataAdapter {
         } else {
             Log.e(TAG, "video data not found");
         }
+        c.close();
     }
 
     // TODO: put the database query on background thread
@@ -175,6 +176,7 @@ public class CameraDataAdapter implements LocalDataAdapter {
             // a new data.
             insertData(newData);
         }
+        c.close();
     }
 
     @Override
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index bb451fa0f..fe5610863 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -457,6 +457,7 @@ public abstract class LocalMediaData implements LocalData {
                 return null;
             }
             PhotoData newData = buildFromCursor(c);
+            c.close();
             return newData;
         }
 
@@ -744,6 +745,7 @@ public abstract class LocalMediaData implements LocalData {
                 return null;
             }
             VideoData newData = buildFromCursor(c);
+            c.close();
             return newData;
         }