Revert "Camera: Mem-leak"

This reverts commit 46b761ab50e36daa2ff79527553014905e784895.

We see some regressions with this change
so we are reverting it for now. We will
fix the issues soon.

Change-Id: I59da92087006cef0da16c8a11fe7c31f32aa0312

3 files changed, 6 insertions, 25 deletions

diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index ac61934fc..4643d03bf 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -44,7 +44,7 @@ public class CameraDataAdapter implements LocalDataAdapter {
     private static final int DEFAULT_DECODE_SIZE = 1600;
     private static final String[] CAMERA_PATH = { Storage.DIRECTORY + "/%" ,SDCard.instance().getDirectory() + "/%"};
 
-    private LocalDataList mImages = null;
+    private LocalDataList mImages;
 
     private Listener mListener;
     private Drawable mPlaceHolder;
@@ -124,18 +124,11 @@ public class CameraDataAdapter implements LocalDataAdapter {
     @Override
     public void removeData(Context c, int dataID) {
         if (dataID >= mImages.size()) return;
-        if (dataID == -1) {
-            if ( (mImages != null) && (mImages.size() > 0) ) {
-                 mImages.cleanup();
-                 mImages = null;
-            }
-        } else {
-            LocalData d = mImages.remove(dataID);
-            // Delete previously removed data first.
-            executeDeletion(c);
-            mLocalDataToDelete = d;
-            mListener.onDataRemoved(dataID, d);
-        }
+        LocalData d = mImages.remove(dataID);
+        // Delete previously removed data first.
+        executeDeletion(c);
+        mLocalDataToDelete = d;
+        mListener.onDataRemoved(dataID, d);
     }
 
     // TODO: put the database query on background thread
diff --git a/src/com/android/camera/data/FixedFirstDataAdapter.java b/src/com/android/camera/data/FixedFirstDataAdapter.java
index f89f1ca94..e26ec2785 100644
--- a/src/com/android/camera/data/FixedFirstDataAdapter.java
+++ b/src/com/android/camera/data/FixedFirstDataAdapter.java
@@ -67,8 +67,6 @@ public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
     public void removeData(Context context, int dataID) {
         if (dataID > 0) {
             mAdapter.removeData(context, dataID - 1);
-        } else {
-            mAdapter.removeData(context, dataID);
         }
     }
 
diff --git a/src/com/android/camera/data/LocalDataList.java b/src/com/android/camera/data/LocalDataList.java
index 7e6fc453d..3ccc4de54 100644
--- a/src/com/android/camera/data/LocalDataList.java
+++ b/src/com/android/camera/data/LocalDataList.java
@@ -64,16 +64,6 @@ public class LocalDataList {
         return mUriMap.get(uri);
     }
 
-    public void cleanup() {
-        if ((mList != null) && (mList.size() > 0)) {
-             for(int i=0;i<mList.size();i++) {
-                 remove(i);
-             }
-        }
-        mList = null;
-        mUriMap = null;
-    }
-
     public void set(int pos, LocalData data) {
         mList.set(pos, data);
         mUriMap.put(data.getContentUri(), data);