1 files changed, 17 insertions, 4 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 7059221b8..bc3c6bc63 100755
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -51,6 +51,7 @@ public class CameraDataAdapter implements LocalDataAdapter {
     private int mSuggestedHeight = DEFAULT_DECODE_SIZE;
 
     private LocalData mLocalDataToDelete;
+    private QueryTask mQueryTask;
 
     public CameraDataAdapter(int placeholderResource) {
         mImages = new LocalDataList();
@@ -59,8 +60,15 @@ public class CameraDataAdapter implements LocalDataAdapter {
 
     @Override
     public void requestLoad(ContentResolver resolver) {
-        QueryTask qtask = new QueryTask();
-        qtask.execute(resolver);
+        mQueryTask = new QueryTask();
+        mQueryTask.execute(resolver);
+    }
+
+    @Override
+    public void stopLoading() {
+        if (mQueryTask != null) {
+            mQueryTask.cancel(true);
+        }
     }
 
     @Override
@@ -328,7 +336,7 @@ public class CameraDataAdapter implements LocalDataAdapter {
             if (c != null && c.moveToFirst()) {
                 // build up the list.
                 c.moveToFirst();
-                while (true) {
+                while (!isCancelled()) {
                     LocalData data = LocalMediaData.VideoData.buildFromCursor(c);
                     if (data != null) {
                         l.add(data);
@@ -356,7 +364,12 @@ public class CameraDataAdapter implements LocalDataAdapter {
 
         @Override
         protected void onPostExecute(LocalDataList l) {
-            replaceData(l);
+            if (!isCancelled()) {
+                replaceData(l);
+            }
+            if (mQueryTask == this) {
+                mQueryTask = null;
+            }
         }
     }