Snap for 6439596 from 727b980e6d97b7cbbc61b987106315c7b68527f4 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: If427e0cc765e9d9bb55488e6fd198d0c7f042618

3 files changed, 11 insertions, 82 deletions

diff --git a/build.gradle b/build.gradle
index 828a192..1765a3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,6 @@
 //     include(":volley")
 //     project(':volley').buildFileName = 'rules.gradle'
 
-import net.ltgt.gradle.errorprone.CheckSeverity
-
 buildscript {
     repositories {
         jcenter()
@@ -28,9 +26,7 @@ buildscript {
 
 plugins {
     id "com.github.sherter.google-java-format" version "0.6"
-    // NOTE: 0.7 or newer will require upgrading to a newer Android gradle plugin:
-    // https://github.com/tbroyer/gradle-errorprone-plugin/commit/65b1026ebeae1b7ed8c28578c7f6eea512c16bea
-    id "net.ltgt.errorprone" version "0.6.1"
+    id "net.ltgt.errorprone" version "0.0.13"
 }
 
 googleJavaFormat {
@@ -45,15 +41,6 @@ repositories {
     google()
 }
 
-dependencies {
-    // NOTE: Updating ErrorProne introduces new checks that may cause the build to fail. Pin to a
-    // specific version to control these updates.
-    errorprone("com.google.errorprone:error_prone_core:2.3.2")
-    // ErrorProne requires a JDK 9 compiler, so pull one in as a dependency since we use Java 8:
-    // https://github.com/tbroyer/gradle-errorprone-plugin#jdk-8-support
-    errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
-}
-
 group = 'com.android.volley'
 version = '1.2.0-SNAPSHOT'
 
@@ -68,9 +55,7 @@ android {
 }
 
 tasks.withType(JavaCompile) {
-    options.errorprone {
-        check("ParameterComment", CheckSeverity.ERROR)
-    }
+    options.compilerArgs << "-Xep:ParameterComment:ERROR"
 }
 
 apply from: 'rules.gradle'
diff --git a/src/main/java/com/android/volley/toolbox/NetworkImageView.java b/src/main/java/com/android/volley/toolbox/NetworkImageView.java
index a24b3e2..53affc3 100644
--- a/src/main/java/com/android/volley/toolbox/NetworkImageView.java
+++ b/src/main/java/com/android/volley/toolbox/NetworkImageView.java
@@ -15,7 +15,6 @@ package com.android.volley.toolbox;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.ViewGroup.LayoutParams;
@@ -33,37 +32,25 @@ public class NetworkImageView extends ImageView {
 
     /**
      * Resource ID of the image to be used as a placeholder until the network image is loaded. Won't
-     * be set at the same time as mDefaultImageDrawable or mDefaultImageBitmap.
+     * be set at the same time as mDefaultImageBitmap.
      */
     private int mDefaultImageId;
 
     /**
-     * Drawable of the image to be used as a placeholder until the network image is loaded. Won't be
-     * set at the same time as mDefaultImageId or mDefaultImageBitmap.
-     */
-    @Nullable private Drawable mDefaultImageDrawable;
-
-    /**
      * Bitmap of the image to be used as a placeholder until the network image is loaded. Won't be
-     * set at the same time as mDefaultImageId or mDefaultImageDrawable.
+     * set at the same time as mDefaultImageId.
      */
-    @Nullable private Bitmap mDefaultImageBitmap;
+    @Nullable Bitmap mDefaultImageBitmap;
 
     /**
      * Resource ID of the image to be used if the network response fails. Won't be set at the same
-     * time as mErrorImageDrawable or mErrorImageBitmap.
+     * time as mErrorImageBitmap.
      */
     private int mErrorImageId;
 
     /**
      * Bitmap of the image to be used if the network response fails. Won't be set at the same time
-     * as mErrorImageId or mErrorImageBitmap.
-     */
-    @Nullable private Drawable mErrorImageDrawable;
-
-    /**
-     * Bitmap of the image to be used if the network response fails. Won't be set at the same time
-     * as mErrorImageId or mErrorImageDrawable.
+     * as mErrorImageId.
      */
     @Nullable private Bitmap mErrorImageBitmap;
 
@@ -113,38 +100,21 @@ 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>This will clear anything set by {@link NetworkImageView#setDefaultImageBitmap} or {@link
-     * NetworkImageView#setDefaultImageDrawable}.
+     * <p>This will clear anything set by {@link NetworkImageView#setDefaultImageBitmap}.
      */
     public void setDefaultImageResId(int defaultImage) {
         mDefaultImageBitmap = null;
-        mDefaultImageDrawable = null;
         mDefaultImageId = defaultImage;
     }
 
     /**
-     * Sets the default image drawable to be used for this view until the attempt to load it
-     * completes.
-     *
-     * <p>This will clear anything set by {@link NetworkImageView#setDefaultImageResId} or {@link
-     * NetworkImageView#setDefaultImageBitmap}.
-     */
-    public void setDefaultImageDrawable(@Nullable Drawable defaultImageDrawable) {
-        mDefaultImageId = 0;
-        mDefaultImageBitmap = null;
-        mDefaultImageDrawable = defaultImageDrawable;
-    }
-
-    /**
      * Sets the default image bitmap to be used for this view until the attempt to load it
      * completes.
      *
-     * <p>This will clear anything set by {@link NetworkImageView#setDefaultImageResId} or {@link
-     * NetworkImageView#setDefaultImageDrawable}.
+     * <p>This will clear anything set by {@link NetworkImageView#setDefaultImageResId}.
      */
     public void setDefaultImageBitmap(Bitmap defaultImage) {
         mDefaultImageId = 0;
-        mDefaultImageDrawable = null;
         mDefaultImageBitmap = defaultImage;
     }
 
@@ -152,38 +122,21 @@ 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>This will clear anything set by {@link NetworkImageView#setErrorImageBitmap} or {@link
-     * NetworkImageView#setErrorImageDrawable}.
+     * <p>This will clear anything set by {@link NetworkImageView#setErrorImageBitmap}.
      */
     public void setErrorImageResId(int errorImage) {
         mErrorImageBitmap = null;
-        mErrorImageDrawable = null;
         mErrorImageId = errorImage;
     }
 
     /**
-     * Sets the error image drawable to be used for this view in the event that the image requested
-     * fails to load.
-     *
-     * <p>This will clear anything set by {@link NetworkImageView#setErrorImageResId} or {@link
-     * NetworkImageView#setDefaultImageBitmap}.
-     */
-    public void setErrorImageDrawable(@Nullable Drawable errorImageDrawable) {
-        mErrorImageId = 0;
-        mErrorImageBitmap = null;
-        mErrorImageDrawable = errorImageDrawable;
-    }
-
-    /**
      * Sets the error image bitmap to be used for this view in the event that the image requested
      * fails to load.
      *
-     * <p>This will clear anything set by {@link NetworkImageView#setErrorImageResId} or {@link
-     * NetworkImageView#setDefaultImageDrawable}.
+     * <p>This will clear anything set by {@link NetworkImageView#setErrorImageResId}.
      */
     public void setErrorImageBitmap(Bitmap errorImage) {
         mErrorImageId = 0;
-        mErrorImageDrawable = null;
         mErrorImageBitmap = errorImage;
     }
 
@@ -249,8 +202,6 @@ public class NetworkImageView extends ImageView {
                             public void onErrorResponse(VolleyError error) {
                                 if (mErrorImageId != 0) {
                                     setImageResource(mErrorImageId);
-                                } else if (mErrorImageDrawable != null) {
-                                    setImageDrawable(mErrorImageDrawable);
                                 } else if (mErrorImageBitmap != null) {
                                     setImageBitmap(mErrorImageBitmap);
                                 }
@@ -281,8 +232,6 @@ public class NetworkImageView extends ImageView {
                                     setImageBitmap(response.getBitmap());
                                 } else if (mDefaultImageId != 0) {
                                     setImageResource(mDefaultImageId);
-                                } else if (mDefaultImageDrawable != null) {
-                                    setImageDrawable(mDefaultImageDrawable);
                                 } else if (mDefaultImageBitmap != null) {
                                     setImageBitmap(mDefaultImageBitmap);
                                 }
@@ -296,8 +245,6 @@ public class NetworkImageView extends ImageView {
     private void setDefaultImageOrNull() {
         if (mDefaultImageId != 0) {
             setImageResource(mDefaultImageId);
-        } else if (mDefaultImageDrawable != null) {
-            setImageDrawable(mDefaultImageDrawable);
         } else if (mDefaultImageBitmap != null) {
             setImageBitmap(mDefaultImageBitmap);
         } else {
diff --git a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
index fd2073e..7705a8f 100644
--- a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
+++ b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageView.ScaleType;
@@ -91,10 +90,8 @@ public class NetworkImageViewTest {
 
         assertNotNull(
                 NetworkImageView.class.getMethod("setImageUrl", String.class, ImageLoader.class));
-        assertNotNull(NetworkImageView.class.getMethod("setDefaultImageDrawable", Drawable.class));
         assertNotNull(NetworkImageView.class.getMethod("setDefaultImageBitmap", Bitmap.class));
         assertNotNull(NetworkImageView.class.getMethod("setDefaultImageResId", int.class));
-        assertNotNull(NetworkImageView.class.getMethod("setErrorImageDrawable", Drawable.class));
         assertNotNull(NetworkImageView.class.getMethod("setErrorImageBitmap", Bitmap.class));
         assertNotNull(NetworkImageView.class.getMethod("setErrorImageResId", int.class));
     }