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, 58 insertions, 44 deletions

diff --git a/src/test/java/com/android/volley/toolbox/BasicNetworkTest.java b/src/test/java/com/android/volley/toolbox/BasicNetworkTest.java
index 7f0d5e2..adf695d 100644
--- a/src/test/java/com/android/volley/toolbox/BasicNetworkTest.java
+++ b/src/test/java/com/android/volley/toolbox/BasicNetworkTest.java
@@ -16,6 +16,16 @@
 
 package com.android.volley.toolbox;
 
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.MockitoAnnotations.initMocks;
+
 import com.android.volley.AuthFailureError;
 import com.android.volley.Cache.Entry;
 import com.android.volley.Header;
@@ -27,33 +37,22 @@ import com.android.volley.ServerError;
 import com.android.volley.TimeoutError;
 import com.android.volley.VolleyError;
 import com.android.volley.mock.MockHttpStack;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.SocketTimeoutException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.MockitoAnnotations.initMocks;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class BasicNetworkTest {
@@ -61,14 +60,16 @@ public class BasicNetworkTest {
     @Mock private Request<String> mMockRequest;
     @Mock private RetryPolicy mMockRetryPolicy;
 
-    @Before public void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         initMocks(this);
     }
 
-    @Test public void headersAndPostParams() throws Exception {
+    @Test
+    public void headersAndPostParams() throws Exception {
         MockHttpStack mockHttpStack = new MockHttpStack();
         InputStream responseStream =
-                new ByteArrayInputStream("foobar".getBytes());
+                new ByteArrayInputStream("foobar".getBytes(StandardCharsets.UTF_8));
         HttpResponse fakeResponse =
                 new HttpResponse(200, Collections.<Header>emptyList(), 6, responseStream);
         mockHttpStack.setResponseToReturn(fakeResponse);
@@ -81,12 +82,16 @@ public class BasicNetworkTest {
         httpNetwork.performRequest(request);
         assertEquals("foo", mockHttpStack.getLastHeaders().get("requestheader"));
         assertEquals("foobar", mockHttpStack.getLastHeaders().get("If-None-Match"));
-        assertEquals("Sat, 19 Aug 2017 00:20:02 GMT",
+        assertEquals(
+                "Sat, 19 Aug 2017 00:20:02 GMT",
                 mockHttpStack.getLastHeaders().get("If-Modified-Since"));
-        assertEquals("requestpost=foo&", new String(mockHttpStack.getLastPostBody()));
+        assertEquals(
+                "requestpost=foo&",
+                new String(mockHttpStack.getLastPostBody(), StandardCharsets.UTF_8));
     }
 
-    @Test public void notModified() throws Exception {
+    @Test
+    public void notModified() throws Exception {
         MockHttpStack mockHttpStack = new MockHttpStack();
         List<Header> headers = new ArrayList<>();
         headers.add(new Header("ServerKeyA", "ServerValueA"));
@@ -94,8 +99,7 @@ public class BasicNetworkTest {
         headers.add(new Header("SharedKey", "ServerValueShared"));
         headers.add(new Header("sharedcaseinsensitivekey", "ServerValueShared1"));
         headers.add(new Header("SharedCaseInsensitiveKey", "ServerValueShared2"));
-        HttpResponse fakeResponse =
-                new HttpResponse(HttpURLConnection.HTTP_NOT_MODIFIED, headers);
+        HttpResponse fakeResponse = new HttpResponse(HttpURLConnection.HTTP_NOT_MODIFIED, headers);
         mockHttpStack.setResponseToReturn(fakeResponse);
         BasicNetwork httpNetwork = new BasicNetwork(mockHttpStack);
         Request<String> request = buildRequest();
@@ -117,11 +121,14 @@ public class BasicNetworkTest {
         expectedHeaders.add(new Header("SharedCaseInsensitiveKey", "ServerValueShared2"));
         expectedHeaders.add(new Header("CachedKeyA", "CachedValueA"));
         expectedHeaders.add(new Header("CachedKeyB", "CachedValueB"));
-        assertThat(expectedHeaders, containsInAnyOrder(
-                response.allHeaders.toArray(new Header[response.allHeaders.size()])));
+        assertThat(
+                expectedHeaders,
+                containsInAnyOrder(
+                        response.allHeaders.toArray(new Header[response.allHeaders.size()])));
     }
 
-    @Test public void notModified_legacyCache() throws Exception {
+    @Test
+    public void notModified_legacyCache() throws Exception {
         MockHttpStack mockHttpStack = new MockHttpStack();
         List<Header> headers = new ArrayList<>();
         headers.add(new Header("ServerKeyA", "ServerValueA"));
@@ -129,8 +136,7 @@ public class BasicNetworkTest {
         headers.add(new Header("SharedKey", "ServerValueShared"));
         headers.add(new Header("sharedcaseinsensitivekey", "ServerValueShared1"));
         headers.add(new Header("SharedCaseInsensitiveKey", "ServerValueShared2"));
-        HttpResponse fakeResponse =
-                new HttpResponse(HttpURLConnection.HTTP_NOT_MODIFIED, headers);
+        HttpResponse fakeResponse = new HttpResponse(HttpURLConnection.HTTP_NOT_MODIFIED, headers);
         mockHttpStack.setResponseToReturn(fakeResponse);
         BasicNetwork httpNetwork = new BasicNetwork(mockHttpStack);
         Request<String> request = buildRequest();
@@ -152,11 +158,14 @@ public class BasicNetworkTest {
         expectedHeaders.add(new Header("SharedCaseInsensitiveKey", "ServerValueShared2"));
         expectedHeaders.add(new Header("CachedKeyA", "CachedValueA"));
         expectedHeaders.add(new Header("CachedKeyB", "CachedValueB"));
-        assertThat(expectedHeaders, containsInAnyOrder(
-                response.allHeaders.toArray(new Header[response.allHeaders.size()])));
+        assertThat(
+                expectedHeaders,
+                containsInAnyOrder(
+                        response.allHeaders.toArray(new Header[response.allHeaders.size()])));
     }
 
-    @Test public void socketTimeout() throws Exception {
+    @Test
+    public void socketTimeout() throws Exception {
         MockHttpStack mockHttpStack = new MockHttpStack();
         mockHttpStack.setExceptionToThrow(new SocketTimeoutException());
         BasicNetwork httpNetwork = new BasicNetwork(mockHttpStack);
@@ -172,7 +181,8 @@ public class BasicNetworkTest {
         verify(mMockRetryPolicy).retry(any(TimeoutError.class));
     }
 
-    @Test public void noConnection() throws Exception {
+    @Test
+    public void noConnection() throws Exception {
         MockHttpStack mockHttpStack = new MockHttpStack();
         mockHttpStack.setExceptionToThrow(new IOException());
         BasicNetwork httpNetwork = new BasicNetwork(mockHttpStack);
@@ -188,7 +198,8 @@ public class BasicNetworkTest {
         verify(mMockRetryPolicy, never()).retry(any(VolleyError.class));
     }
 
-    @Test public void unauthorized() throws Exception {
+    @Test
+    public void unauthorized() throws Exception {
         MockHttpStack mockHttpStack = new MockHttpStack();
         HttpResponse fakeResponse = new HttpResponse(401, Collections.<Header>emptyList());
         mockHttpStack.setResponseToReturn(fakeResponse);
@@ -205,7 +216,8 @@ public class BasicNetworkTest {
         verify(mMockRetryPolicy).retry(any(AuthFailureError.class));
     }
 
-    @Test public void forbidden() throws Exception {
+    @Test
+    public void forbidden() throws Exception {
         MockHttpStack mockHttpStack = new MockHttpStack();
         HttpResponse fakeResponse = new HttpResponse(403, Collections.<Header>emptyList());
         mockHttpStack.setResponseToReturn(fakeResponse);
@@ -222,7 +234,8 @@ public class BasicNetworkTest {
         verify(mMockRetryPolicy).retry(any(AuthFailureError.class));
     }
 
-    @Test public void redirect() throws Exception {
+    @Test
+    public void redirect() throws Exception {
         for (int i = 300; i <= 399; i++) {
             MockHttpStack mockHttpStack = new MockHttpStack();
             HttpResponse fakeResponse = new HttpResponse(i, Collections.<Header>emptyList());
@@ -242,7 +255,8 @@ public class BasicNetworkTest {
         }
     }
 
-    @Test public void otherClientError() throws Exception {
+    @Test
+    public void otherClientError() throws Exception {
         for (int i = 400; i <= 499; i++) {
             if (i == 401 || i == 403) {
                 // covered above.
@@ -266,13 +280,13 @@ public class BasicNetworkTest {
         }
     }
 
-    @Test public void serverError_enableRetries() throws Exception {
+    @Test
+    public void serverError_enableRetries() throws Exception {
         for (int i = 500; i <= 599; i++) {
             MockHttpStack mockHttpStack = new MockHttpStack();
             HttpResponse fakeResponse = new HttpResponse(i, Collections.<Header>emptyList());
             mockHttpStack.setResponseToReturn(fakeResponse);
-            BasicNetwork httpNetwork =
-                    new BasicNetwork(mockHttpStack, new ByteArrayPool(4096));
+            BasicNetwork httpNetwork = new BasicNetwork(mockHttpStack, new ByteArrayPool(4096));
             Request<String> request = buildRequest();
             request.setRetryPolicy(mMockRetryPolicy);
             request.setShouldRetryServerErrors(true);
@@ -288,7 +302,8 @@ public class BasicNetworkTest {
         }
     }
 
-    @Test public void serverError_disableRetries() throws Exception {
+    @Test
+    public void serverError_disableRetries() throws Exception {
         for (int i = 500; i <= 599; i++) {
             MockHttpStack mockHttpStack = new MockHttpStack();
             HttpResponse fakeResponse = new HttpResponse(i, Collections.<Header>emptyList());
@@ -317,8 +332,7 @@ public class BasicNetworkTest {
             }
 
             @Override
-            protected void deliverResponse(String response) {
-            }
+            protected void deliverResponse(String response) {}
 
             @Override
             public Map<String, String> getHeaders() {