refine handling of exceptional cases: no settings, network failure, load error.

Bug: 7194196
Bug: 7152553
Change-Id: I4335e46fe3a61a09ce3b14a02bb199a84126e53f

1 files changed, 0 insertions, 12 deletions

diff --git a/src/com/android/dreams/phototable/PhotoSourcePlexor.java b/src/com/android/dreams/phototable/PhotoSourcePlexor.java
index 7cf207e..cf19d80 100644
--- a/src/com/android/dreams/phototable/PhotoSourcePlexor.java
+++ b/src/com/android/dreams/phototable/PhotoSourcePlexor.java
@@ -34,7 +34,6 @@ public class PhotoSourcePlexor extends PhotoSource {
 
     private final PhotoSource mPicasaSource;
     private final PhotoSource mLocalSource;
-    private final PhotoSource mStockSource;
     private SharedPreferences mSettings;
 
     public PhotoSourcePlexor(Context context, SharedPreferences settings) {
@@ -42,7 +41,6 @@ public class PhotoSourcePlexor extends PhotoSource {
         mSourceName = TAG;
         mPicasaSource = new PicasaSource(context, settings);
         mLocalSource = new LocalSource(context, settings);
-        mStockSource = new StockSource(context, settings);
     }
 
     @Override
@@ -56,11 +54,6 @@ public class PhotoSourcePlexor extends PhotoSource {
         foundAlbums.addAll(mLocalSource.findAlbums());
         log(TAG, "found " + foundAlbums.size() + " user albums");
 
-        if (foundAlbums.isEmpty()) {
-            foundAlbums.addAll(mStockSource.findAlbums());
-        }
-        log(TAG, "found " + foundAlbums.size() + " albums");
-
         return foundAlbums;
     }
 
@@ -75,11 +68,6 @@ public class PhotoSourcePlexor extends PhotoSource {
         foundImages.addAll(mLocalSource.findImages(howMany));
         log(TAG, "found " + foundImages.size() + " user images");
 
-        if (foundImages.isEmpty()) {
-            foundImages.addAll(mStockSource.findImages(howMany));
-        }
-        log(TAG, "found " + foundImages.size() + " images");
-
         return foundImages;
     }