Fix camera preview stopped after onResume().

This fix is for the blank camera preview blank after onPause() -> onResume().
1. Refined camera start up procedure by removing redundant camera startup
   thread.
2. Cleanup unused calls after aparted from gallery.

  bug:10189998

Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7

2 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index c265e397e..2cdb2c172 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -276,6 +276,14 @@ public class CameraDataAdapter implements LocalDataAdapter {
     }
 
     private class QueryTask extends AsyncTask<ContentResolver, Void, List<LocalData>> {
+
+        /**
+         * Loads all the photo and video data in the camera folder in background
+         * and combine them into one single list.
+         *
+         * @param resolver {@link ContentResolver} to load all the data.
+         * @return An {@link ArrayList} of all loaded data.
+         */
         @Override
         protected List<LocalData> doInBackground(ContentResolver... resolver) {
             List<LocalData> l = new ArrayList<LocalData>();
diff --git a/src/com/android/camera/data/FixedFirstDataAdapter.java b/src/com/android/camera/data/FixedFirstDataAdapter.java
index ecb9c1402..9f3c4107b 100644
--- a/src/com/android/camera/data/FixedFirstDataAdapter.java
+++ b/src/com/android/camera/data/FixedFirstDataAdapter.java
@@ -20,7 +20,6 @@ import android.content.Context;
 import android.net.Uri;
 import android.view.View;
 
-import com.android.camera.ui.FilmStripView;
 import com.android.camera.ui.FilmStripView.DataAdapter;
 import com.android.camera.ui.FilmStripView.ImageData;
 
@@ -32,6 +31,9 @@ import com.android.camera.ui.FilmStripView.ImageData;
 public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
         implements DataAdapter.Listener {
 
+    @SuppressWarnings("unused")
+    private static final String TAG = "CAM_FixedFirstDataAdapter";
+
     private LocalData mFirstData;
     private Listener mListener;