Don't return null if there's no images to load.

  bug:10294250

Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549

1 files changed, 7 insertions, 4 deletions

diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 54e806d4c..c265e397e 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -266,9 +266,11 @@ public class CameraDataAdapter implements LocalDataAdapter {
 
     /** Update all the data */
     private void replaceData(List<LocalData> list) {
-        boolean changed = (list != mImages);
+        if (list.size() == 0 && mImages.size() == 0) {
+            return;
+        }
         mImages = list;
-        if (changed) {
+        if (mListener != null) {
             mListener.onDataLoaded();
         }
     }
@@ -330,9 +332,10 @@ public class CameraDataAdapter implements LocalDataAdapter {
                 c.close();
             }
 
-            if (l.size() == 0) return null;
+            if (l.size() != 0) {
+                Collections.sort(l, new LocalData.NewestFirstComparator());
+            }
 
-            Collections.sort(l, new LocalData.NewestFirstComparator());
             return l;
         }