Import of Volley from GitHub to AOSP.android-o-mr1-iot-release-1.0.1

Adds android-support-annotations as a runtime dependency in Android.mk.

  - 28588322fa4eca3c1a7922b8a2f7b4a97d5c099a Fix concurrent modification errors in ImageContainer. (#1... by Jeff Davidson <jpd236@cornell.edu>
  - ba3b40457a97b3b3812cb00191b41cb0af4149df Fix unchecked operations in Volley build. (#178) by Jeff Davidson <jpd236@cornell.edu>
  - 62c19019e43a76ba4a084b25548e7fb1cfd4a457 Always close HttpURLConnections in HurlStack. (#176) by Jeff Davidson <jpd236@cornell.edu>
  - 36c80f25a78cf2ba2feb2d697f12f9bbca96bf43 Port dispatcher tests to mockito. (#172) by Jeff Davidson <jpd236@cornell.edu>
  - 15b55093fc8ac86902a745f46a2bdea825e797a3 Cleaning up parameter comments + unnecessary generics. (#... by Jeff Davidson <jpd236@cornell.edu>
  - 6b341755e522f23de149544536b9b69c7b7b8305 Remove all wildcard imports. (#170) by Jeff Davidson <jpd236@cornell.edu>
  - a8424005b3ba6d17fc9e123a2176da702f3ead10 Use actual annotations instead of comments. (#169) by Jeff Davidson <jpd236@cornell.edu>
  - bdc80555aee738235bd33c26878bbe8ce382d795 Apply google-java-format to all code. (#165) by Jeff Davidson <jpd236@cornell.edu>
  - 5307293b15dd0c32f53b8f1fd8c198caa443982e Integrate Volley builds with errorprone. (#162) by Jeff Davidson <jpd236@cornell.edu>
  - fa586029500e6813d654f1b454cd3345b0a43897 Fail Travis builds if snapshot uploading fails. (#163) by Jeff Davidson <jpd236@cornell.edu>
  - 0ebb97e9b0192e879088b38b5992158e99364dc6 Stop publishing bintray-info.json. (#141) by Jeff Davidson <jpd236@cornell.edu>
  - b89dfbd2e6964acfe5561e268300611a83957a15 fix: request time contains RequestQueue blocking time. (#... by dezng <dezng123@gmail.com>
  - c2bfd86596e588c924c2c7e0ae0940053800af5c Guard against illegal argument and OOM exceptions in read... by Joe Bowbeer <joe.bowbeer@gmail.com>
  - fc8ff0423fe9a3af6595088b34f912fb2d920ffb Log fix (#112) by Navid Ht <navid.htb@gmail.com>
  - 47586f0fd42acd5ce09dfc767387df685edfa547 Bump version to 1.1.1-SNAPSHOT. (#123) by Jeff Davidson <jpd236@cornell.edu>
  - 1392f961af17d0f5ba367d8d199a18e5325b882e Update deploy credentials. (#122) by Jeff Davidson <jpd236@cornell.edu>
  - ffe9281709f38f84492ce898603d3ec084326a57 Set project group and version. (#120) by Jeff Davidson <jpd236@cornell.edu>

GitOrigin-RevId: 28588322fa4eca3c1a7922b8a2f7b4a97d5c099a
Change-Id: Ifeea069df2f0a5fd10bc3d4686601c88906ee653

1 files changed, 48 insertions, 38 deletions

diff --git a/src/test/java/com/android/volley/RequestQueueIntegrationTest.java b/src/test/java/com/android/volley/RequestQueueIntegrationTest.java
index 304a1ab..a2bfbc6 100644
--- a/src/test/java/com/android/volley/RequestQueueIntegrationTest.java
+++ b/src/test/java/com/android/volley/RequestQueueIntegrationTest.java
@@ -16,13 +16,19 @@
 
 package com.android.volley;
 
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
 import com.android.volley.Request.Priority;
 import com.android.volley.RequestQueue.RequestFinishedListener;
 import com.android.volley.mock.MockRequest;
 import com.android.volley.mock.ShadowSystemClock;
 import com.android.volley.toolbox.NoCache;
 import com.android.volley.utils.ImmediateResponseDelivery;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,14 +39,6 @@ import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-
 /**
  * Integration tests for {@link RequestQueue} that verify its behavior in conjunction with real
  * dispatcher, queues and Requests.
@@ -56,12 +54,14 @@ public class RequestQueueIntegrationTest {
     @Mock private RequestFinishedListener<byte[]> mMockListener;
     @Mock private RequestFinishedListener<byte[]> mMockListener2;
 
-    @Before public void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         mDelivery = new ImmediateResponseDelivery();
         initMocks(this);
     }
 
-    @Test public void add_requestProcessedInCorrectOrder() throws Exception {
+    @Test
+    public void add_requestProcessedInCorrectOrder() throws Exception {
         // Enqueue 2 requests with different cache keys, and different priorities. The second,
         // higher priority request takes 20ms.
         // Assert that the first request is only handled after the first one has been parsed and
@@ -73,13 +73,15 @@ public class RequestQueueIntegrationTest {
         lowerPriorityReq.setPriority(Priority.LOW);
         higherPriorityReq.setPriority(Priority.HIGH);
 
-        Answer<NetworkResponse> delayAnswer = new Answer<NetworkResponse>() {
-            @Override
-            public NetworkResponse answer(InvocationOnMock invocationOnMock) throws Throwable {
-                Thread.sleep(20);
-                return mock(NetworkResponse.class);
-            }
-        };
+        Answer<NetworkResponse> delayAnswer =
+                new Answer<NetworkResponse>() {
+                    @Override
+                    public NetworkResponse answer(InvocationOnMock invocationOnMock)
+                            throws Throwable {
+                        Thread.sleep(20);
+                        return mock(NetworkResponse.class);
+                    }
+                };
         // delay only for higher request
         when(mMockNetwork.performRequest(higherPriorityReq)).thenAnswer(delayAnswer);
         when(mMockNetwork.performRequest(lowerPriorityReq)).thenReturn(mock(NetworkResponse.class));
@@ -100,19 +102,22 @@ public class RequestQueueIntegrationTest {
     }
 
     /** Asserts that requests with same cache key are processed in order. */
-    @Test public void add_dedupeByCacheKey() throws Exception {
+    @Test
+    public void add_dedupeByCacheKey() throws Exception {
         // Enqueue 2 requests with the same cache key. The first request takes 20ms. Assert that the
         // second request is only handled after the first one has been parsed and delivered.
         MockRequest req1 = new MockRequest();
         MockRequest req2 = new MockRequest();
-        Answer<NetworkResponse> delayAnswer = new Answer<NetworkResponse>() {
-            @Override
-            public NetworkResponse answer(InvocationOnMock invocationOnMock) throws Throwable {
-                Thread.sleep(20);
-                return mock(NetworkResponse.class);
-            }
-        };
-        //delay only for first
+        Answer<NetworkResponse> delayAnswer =
+                new Answer<NetworkResponse>() {
+                    @Override
+                    public NetworkResponse answer(InvocationOnMock invocationOnMock)
+                            throws Throwable {
+                        Thread.sleep(20);
+                        return mock(NetworkResponse.class);
+                    }
+                };
+        // delay only for first
         when(mMockNetwork.performRequest(req1)).thenAnswer(delayAnswer);
         when(mMockNetwork.performRequest(req2)).thenReturn(mock(NetworkResponse.class));
 
@@ -131,16 +136,19 @@ public class RequestQueueIntegrationTest {
         queue.stop();
     }
 
-    /** Verify RequestFinishedListeners are informed when requests are canceled.  */
-    @Test public void add_requestFinishedListenerCanceled() throws Exception {
+    /** Verify RequestFinishedListeners are informed when requests are canceled. */
+    @Test
+    public void add_requestFinishedListenerCanceled() throws Exception {
         MockRequest request = new MockRequest();
-        Answer<NetworkResponse> delayAnswer = new Answer<NetworkResponse>() {
-            @Override
-            public NetworkResponse answer(InvocationOnMock invocationOnMock) throws Throwable {
-                Thread.sleep(200);
-                return mock(NetworkResponse.class);
-            }
-        };
+        Answer<NetworkResponse> delayAnswer =
+                new Answer<NetworkResponse>() {
+                    @Override
+                    public NetworkResponse answer(InvocationOnMock invocationOnMock)
+                            throws Throwable {
+                        Thread.sleep(200);
+                        return mock(NetworkResponse.class);
+                    }
+                };
         RequestQueue queue = new RequestQueue(new NoCache(), mMockNetwork, 1, mDelivery);
 
         when(mMockNetwork.performRequest(request)).thenAnswer(delayAnswer);
@@ -155,7 +163,8 @@ public class RequestQueueIntegrationTest {
     }
 
     /** Verify RequestFinishedListeners are informed when requests are successfully delivered. */
-    @Test public void add_requestFinishedListenerSuccess() throws Exception {
+    @Test
+    public void add_requestFinishedListenerSuccess() throws Exception {
         MockRequest request = new MockRequest();
         RequestQueue queue = new RequestQueue(new NoCache(), mMockNetwork, 1, mDelivery);
 
@@ -171,7 +180,8 @@ public class RequestQueueIntegrationTest {
     }
 
     /** Verify RequestFinishedListeners are informed when request errors. */
-    @Test public void add_requestFinishedListenerError() throws Exception {
+    @Test
+    public void add_requestFinishedListenerError() throws Exception {
         MockRequest request = new MockRequest();
         RequestQueue queue = new RequestQueue(new NoCache(), mMockNetwork, 1, mDelivery);