diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:54:29 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:54:29 -0800 |
| commit | 7fdd952a334fdf77402daebdee9d3ef65495a323 (patch) | |
| tree | e744616a103d6192d9479bd56a945473ec2d9149 /src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java | |
| parent | f9806b5b17e33cf150d05d6e681be7be24db76a0 (diff) | |
| parent | 0ca39c11901f7d1dc8ad4377cdc65a329baea00d (diff) | |
| download | android_packages_wallpapers_PhotoPhase-shipping/cm-11.0.tar.gz android_packages_wallpapers_PhotoPhase-shipping/cm-11.0.tar.bz2 android_packages_wallpapers_PhotoPhase-shipping/cm-11.0.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0
Diffstat (limited to 'src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java')
| -rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java index f83c392..fa9c637 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java +++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java @@ -478,7 +478,7 @@ public class ChoosePicturesFragment extends PreferenceFragment private void restoreData() { // Restore and the albums the selection mSelectedAlbums = new HashSet<String>(mOriginalSelectedAlbums); - int count = mAlbums.size(); + int count = Math.min(mAlbums.size(), mOriginalAlbums.size()); for (int i = 0; i < count ; i++) { Album album = mAlbums.get(i); Album originalAlbum = mOriginalAlbums.get(i); |