diff options
author | Angus Kong <shkong@google.com> | 2013-08-12 15:54:46 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2013-08-12 15:54:46 -0700 |
commit | d806e6528092fd309bb2128ad5a539c72f52fd42 (patch) | |
tree | db7f11d0acb704ba1d1d24a0674229a69901c652 /src/com/android/camera | |
parent | 39685480a9705a949275c4b9cb0cca46c6c3cbc4 (diff) | |
download | android_packages_apps_Snap-d806e6528092fd309bb2128ad5a539c72f52fd42.tar.gz android_packages_apps_Snap-d806e6528092fd309bb2128ad5a539c72f52fd42.tar.bz2 android_packages_apps_Snap-d806e6528092fd309bb2128ad5a539c72f52fd42.zip |
Don't return null if there's no images to load.
bug:10294250
Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/data/CameraDataAdapter.java | 11 |
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; } |