diff options
author | Bill Rassieur <rassb@google.com> | 2019-04-02 18:31:00 +0000 |
---|---|---|
committer | Bill Rassieur <rassb@google.com> | 2019-04-02 18:31:00 +0000 |
commit | 2642d60e73afdb8f72e87711bbd5db91fbb7a788 (patch) | |
tree | 64996a4d0fe89a8562b0b18c02b0b092c9f86f5b /src/main/java/com/android | |
parent | 39e5b7cdeb5b855db4a0812624a0c4e144b5afe1 (diff) | |
parent | 3425326329100627c7fda2c138c5abdb421f51e9 (diff) | |
download | volley-2642d60e73afdb8f72e87711bbd5db91fbb7a788.tar.gz |
Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I2cbe2b7fdf97ed4c25e6acb66693a5eb9c40bd3a
BUG: 129345239
Diffstat (limited to 'src/main/java/com/android')
15 files changed, 30 insertions, 38 deletions
diff --git a/src/main/java/com/android/volley/CacheDispatcher.java b/src/main/java/com/android/volley/CacheDispatcher.java index 13f250b..be06d1f 100644 --- a/src/main/java/com/android/volley/CacheDispatcher.java +++ b/src/main/java/com/android/volley/CacheDispatcher.java @@ -17,7 +17,7 @@ package com.android.volley; import android.os.Process; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/android/volley/NetworkDispatcher.java b/src/main/java/com/android/volley/NetworkDispatcher.java index 762e030..06057c3 100644 --- a/src/main/java/com/android/volley/NetworkDispatcher.java +++ b/src/main/java/com/android/volley/NetworkDispatcher.java @@ -21,7 +21,7 @@ import android.net.TrafficStats; import android.os.Build; import android.os.Process; import android.os.SystemClock; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import java.util.concurrent.BlockingQueue; /** diff --git a/src/main/java/com/android/volley/Request.java b/src/main/java/com/android/volley/Request.java index 0b18abb..104b046 100644 --- a/src/main/java/com/android/volley/Request.java +++ b/src/main/java/com/android/volley/Request.java @@ -20,10 +20,10 @@ import android.net.TrafficStats; import android.net.Uri; import android.os.Handler; import android.os.Looper; -import android.support.annotation.CallSuper; -import android.support.annotation.GuardedBy; -import android.support.annotation.Nullable; import android.text.TextUtils; +import androidx.annotation.CallSuper; +import androidx.annotation.GuardedBy; +import androidx.annotation.Nullable; import com.android.volley.VolleyLog.MarkerLog; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/main/java/com/android/volley/RequestQueue.java b/src/main/java/com/android/volley/RequestQueue.java index 42b3fa2..c127c7f 100644 --- a/src/main/java/com/android/volley/RequestQueue.java +++ b/src/main/java/com/android/volley/RequestQueue.java @@ -18,7 +18,7 @@ package com.android.volley; import android.os.Handler; import android.os.Looper; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; diff --git a/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java b/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java index 72271fc..f3381ae 100644 --- a/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java +++ b/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java @@ -23,7 +23,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.volley.AuthFailureError; /** diff --git a/src/main/java/com/android/volley/toolbox/BaseHttpStack.java b/src/main/java/com/android/volley/toolbox/BaseHttpStack.java index 4f596e1..99a9899 100644 --- a/src/main/java/com/android/volley/toolbox/BaseHttpStack.java +++ b/src/main/java/com/android/volley/toolbox/BaseHttpStack.java @@ -77,7 +77,7 @@ public abstract class BaseHttpStack implements HttpStack { for (Header header : response.getHeaders()) { headers.add(new BasicHeader(header.getName(), header.getValue())); } - apacheResponse.setHeaders(headers.toArray(new org.apache.http.Header[headers.size()])); + apacheResponse.setHeaders(headers.toArray(new org.apache.http.Header[0])); InputStream responseStream = response.getContent(); if (responseStream != null) { diff --git a/src/main/java/com/android/volley/toolbox/DiskBasedCache.java b/src/main/java/com/android/volley/toolbox/DiskBasedCache.java index 75c217f..a6a0c83 100644 --- a/src/main/java/com/android/volley/toolbox/DiskBasedCache.java +++ b/src/main/java/com/android/volley/toolbox/DiskBasedCache.java @@ -17,8 +17,8 @@ package com.android.volley.toolbox; import android.os.SystemClock; -import android.support.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; import com.android.volley.Cache; import com.android.volley.Header; import com.android.volley.VolleyLog; diff --git a/src/main/java/com/android/volley/toolbox/HurlStack.java b/src/main/java/com/android/volley/toolbox/HurlStack.java index 5af18ef..f85d42c 100644 --- a/src/main/java/com/android/volley/toolbox/HurlStack.java +++ b/src/main/java/com/android/volley/toolbox/HurlStack.java @@ -16,7 +16,7 @@ package com.android.volley.toolbox; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.volley.AuthFailureError; import com.android.volley.Header; import com.android.volley.Request; diff --git a/src/main/java/com/android/volley/toolbox/ImageLoader.java b/src/main/java/com/android/volley/toolbox/ImageLoader.java index 270935f..b80072b 100644 --- a/src/main/java/com/android/volley/toolbox/ImageLoader.java +++ b/src/main/java/com/android/volley/toolbox/ImageLoader.java @@ -17,9 +17,9 @@ import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.os.Handler; import android.os.Looper; -import android.support.annotation.MainThread; import android.widget.ImageView; import android.widget.ImageView.ScaleType; +import androidx.annotation.MainThread; import com.android.volley.Request; import com.android.volley.RequestQueue; import com.android.volley.Response.ErrorListener; diff --git a/src/main/java/com/android/volley/toolbox/ImageRequest.java b/src/main/java/com/android/volley/toolbox/ImageRequest.java index 59e468f..32b5aa3 100644 --- a/src/main/java/com/android/volley/toolbox/ImageRequest.java +++ b/src/main/java/com/android/volley/toolbox/ImageRequest.java @@ -19,10 +19,10 @@ package com.android.volley.toolbox; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.graphics.BitmapFactory; -import android.support.annotation.GuardedBy; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; import android.widget.ImageView.ScaleType; +import androidx.annotation.GuardedBy; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import com.android.volley.DefaultRetryPolicy; import com.android.volley.NetworkResponse; import com.android.volley.ParseError; diff --git a/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java b/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java index 1abaec7..86ed9e9 100644 --- a/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java +++ b/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java @@ -16,7 +16,7 @@ package com.android.volley.toolbox; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.android.volley.NetworkResponse; import com.android.volley.ParseError; import com.android.volley.Response; diff --git a/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java b/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java index cee5efe..8dca0ec 100644 --- a/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java +++ b/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java @@ -16,7 +16,7 @@ package com.android.volley.toolbox; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.android.volley.NetworkResponse; import com.android.volley.ParseError; import com.android.volley.Response; diff --git a/src/main/java/com/android/volley/toolbox/JsonRequest.java b/src/main/java/com/android/volley/toolbox/JsonRequest.java index c00d3db..bc035ae 100644 --- a/src/main/java/com/android/volley/toolbox/JsonRequest.java +++ b/src/main/java/com/android/volley/toolbox/JsonRequest.java @@ -16,8 +16,8 @@ package com.android.volley.toolbox; -import android.support.annotation.GuardedBy; -import android.support.annotation.Nullable; +import androidx.annotation.GuardedBy; +import androidx.annotation.Nullable; import com.android.volley.NetworkResponse; import com.android.volley.Request; import com.android.volley.Response; diff --git a/src/main/java/com/android/volley/toolbox/NetworkImageView.java b/src/main/java/com/android/volley/toolbox/NetworkImageView.java index 6ad1e49..53affc3 100644 --- a/src/main/java/com/android/volley/toolbox/NetworkImageView.java +++ b/src/main/java/com/android/volley/toolbox/NetworkImageView.java @@ -15,12 +15,12 @@ package com.android.volley.toolbox; import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.MainThread; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.ViewGroup.LayoutParams; import android.widget.ImageView; +import androidx.annotation.MainThread; +import androidx.annotation.Nullable; import com.android.volley.VolleyError; import com.android.volley.toolbox.ImageLoader.ImageContainer; import com.android.volley.toolbox.ImageLoader.ImageListener; @@ -100,12 +100,10 @@ public class NetworkImageView extends ImageView { * Sets the default image resource ID to be used for this view until the attempt to load it * completes. * - * <p>Cannot be called with {@link NetworkImageView#setDefaultImageBitmap}. + * <p>This will clear anything set by {@link NetworkImageView#setDefaultImageBitmap}. */ public void setDefaultImageResId(int defaultImage) { - if (mDefaultImageBitmap != null) { - throw new IllegalArgumentException("Can't have a default image resource ID and bitmap"); - } + mDefaultImageBitmap = null; mDefaultImageId = defaultImage; } @@ -113,12 +111,10 @@ public class NetworkImageView extends ImageView { * Sets the default image bitmap to be used for this view until the attempt to load it * completes. * - * <p>Cannot be called with {@link NetworkImageView#setDefaultImageResId}. + * <p>This will clear anything set by {@link NetworkImageView#setDefaultImageResId}. */ public void setDefaultImageBitmap(Bitmap defaultImage) { - if (mDefaultImageId != 0) { - throw new IllegalArgumentException("Can't have a default image resource ID and bitmap"); - } + mDefaultImageId = 0; mDefaultImageBitmap = defaultImage; } @@ -126,12 +122,10 @@ public class NetworkImageView extends ImageView { * Sets the error image resource ID to be used for this view in the event that the image * requested fails to load. * - * <p>Cannot be called with {@link NetworkImageView#setErrorImageBitmap}. + * <p>This will clear anything set by {@link NetworkImageView#setErrorImageBitmap}. */ public void setErrorImageResId(int errorImage) { - if (mErrorImageBitmap != null) { - throw new IllegalArgumentException("Can't have an error image resource ID and bitmap"); - } + mErrorImageBitmap = null; mErrorImageId = errorImage; } @@ -139,12 +133,10 @@ public class NetworkImageView extends ImageView { * Sets the error image bitmap to be used for this view in the event that the image requested * fails to load. * - * <p>Cannot be called with {@link NetworkImageView#setErrorImageResId}. + * <p>This will clear anything set by {@link NetworkImageView#setErrorImageResId}. */ public void setErrorImageBitmap(Bitmap errorImage) { - if (mErrorImageId != 0) { - throw new IllegalArgumentException("Can't have an error image resource ID and bitmap"); - } + mErrorImageId = 0; mErrorImageBitmap = errorImage; } diff --git a/src/main/java/com/android/volley/toolbox/StringRequest.java b/src/main/java/com/android/volley/toolbox/StringRequest.java index c4c89b5..df7b386 100644 --- a/src/main/java/com/android/volley/toolbox/StringRequest.java +++ b/src/main/java/com/android/volley/toolbox/StringRequest.java @@ -16,8 +16,8 @@ package com.android.volley.toolbox; -import android.support.annotation.GuardedBy; -import android.support.annotation.Nullable; +import androidx.annotation.GuardedBy; +import androidx.annotation.Nullable; import com.android.volley.NetworkResponse; import com.android.volley.Request; import com.android.volley.Response; |