Import of Volley from GitHub to AOSP.android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release

  - 321174452380acd5caa7c19aac99cb95a2ed0ff6 Add a default image bitmap and an error image bitmap. (#2... by Ammar Aijazi <aaijazi@users.noreply.github.com>
  - cb5d331761c4785b325acc7ff5caf8f41e932c69 Bump Volley to 1.2.0-SNAPSHOT. by Jeff Davidson <jpd@google.com>
  - c31351334868a17cb79ab5b067d798bc80e343a3 Fix the build. by Jeff Davidson <jpd@google.com>
  - 99d8ed84ddf653cb5f61a9ad63e5a3ced799d9ce Reduce cache churn from large entries. by Jeff Davidson <jpd@google.com>
  - 6b7b3a2df79506269a0730a095849c5a87fc9cbb Enforce disk size limit more strictly in DiskBasedCache. by Jeff Davidson <jpd@google.com>
  - 64481a321b9e57c78f22c7df53732e03f530933a Don't drop batched responses when new requests complete. ... by Jeff Davidson <jpd236@cornell.edu>
  - 4e60e9d2ac2f2c81661a7f0d1bcbc72c190059c2 Bump version to 1.1.2 after final 1.1.1 release by Jeff Davidson <jpd@google.com>
  - d1a3d5388c79ff1a6fdb904daeff9b39d0bb7d26 Delete Android.mk (#204) by Jeff Davidson <jpd236@cornell.edu>

GitOrigin-RevId: 321174452380acd5caa7c19aac99cb95a2ed0ff6
Change-Id: I433459689ad2fe1bf40e8ff30d196d948ef73f81

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/com/android/volley/toolbox/ImageLoader.java b/src/main/java/com/android/volley/toolbox/ImageLoader.java
index 076c212..270935f 100644
--- a/src/main/java/com/android/volley/toolbox/ImageLoader.java
+++ b/src/main/java/com/android/volley/toolbox/ImageLoader.java
@@ -239,8 +239,11 @@ public class ImageLoader {
         // Update the caller to let them know that they should use the default bitmap.
         imageListener.onResponse(imageContainer, true);
 
-        // Check to see if a request is already in-flight.
+        // Check to see if a request is already in-flight or completed but pending batch delivery.
         BatchedImageRequest request = mInFlightRequests.get(cacheKey);
+        if (request == null) {
+            request = mBatchedResponses.get(cacheKey);
+        }
         if (request != null) {
             // If it is, add this request to the list of listeners.
             request.addContainer(imageContainer);