From df2f33537aad974929d77c87297f8b1860d64a54 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Wed, 17 Jan 2018 14:53:15 -0800
Subject: [PATCH] RN: Revert D6701597

Reviewed By: mdvacca

Differential Revision: D6735812

fbshipit-source-id: 8144b72883150f9d7e2614ee0f238c1b8e44c6ab
---
 .../react/views/image/ReactImageView.java     | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
index 1c6625fd7..940ae7f1b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -30,7 +30,6 @@ import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.controller.ControllerListener;
 import com.facebook.drawee.controller.ForwardingControllerListener;
 import com.facebook.drawee.drawable.AutoRotateDrawable;
-import com.facebook.drawee.drawable.RoundedColorDrawable;
 import com.facebook.drawee.drawable.ScalingUtils;
 import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
@@ -149,7 +148,6 @@ public class ReactImageView extends GenericDraweeView {
   private @Nullable ImageSource mImageSource;
   private @Nullable ImageSource mCachedImageSource;
   private @Nullable Drawable mLoadingImageDrawable;
-  private @Nullable RoundedColorDrawable mBackgroundImageDrawable;
   private int mBorderColor;
   private int mOverlayColor;
   private float mBorderWidth;
@@ -240,12 +238,6 @@ public class ReactImageView extends GenericDraweeView {
     mIsDirty = true;
   }
 
-  @Override
-  public void setBackgroundColor(int backgroundColor) {
-    mBackgroundImageDrawable = new RoundedColorDrawable(backgroundColor);
-    mIsDirty = true;
-  }
-
   public void setBorderColor(int borderColor) {
     mBorderColor = borderColor;
     mIsDirty = true;
@@ -385,17 +377,12 @@ public class ReactImageView extends GenericDraweeView {
 
     RoundingParams roundingParams = hierarchy.getRoundingParams();
 
-    cornerRadii(sComputedCornerRadii);
-    roundingParams.setCornersRadii(sComputedCornerRadii[0], sComputedCornerRadii[1], sComputedCornerRadii[2], sComputedCornerRadii[3]);
-
-    if (mBackgroundImageDrawable != null) {
-      mBackgroundImageDrawable.setBorder(mBorderColor, mBorderWidth);
-      mBackgroundImageDrawable.setRadii(roundingParams.getCornersRadii());
-      hierarchy.setBackgroundImage(mBackgroundImageDrawable);
-    }
-
     if (usePostprocessorScaling) {
       roundingParams.setCornersRadius(0);
+    } else {
+      cornerRadii(sComputedCornerRadii);
+
+      roundingParams.setCornersRadii(sComputedCornerRadii[0], sComputedCornerRadii[1], sComputedCornerRadii[2], sComputedCornerRadii[3]);
     }
 
     roundingParams.setBorder(mBorderColor, mBorderWidth);