From c85057c14c7679c177555914dcf81159614c5769 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Thu, 19 Apr 2018 10:11:18 +0800
Subject: [PATCH] Made the DrawableWrapper return the right ColorFilter

Previously it simply returned null

Test: atest cts/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java
Change-Id: Ia4694e8dee08449262bbe1cfd719795fd86e1ee0
Fixes: 78252558
---
 .../java/android/graphics/drawable/DrawableWrapper.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java
index cf821bb6ac8bb..b71f3ef594a9e 100644
--- a/graphics/java/android/graphics/drawable/DrawableWrapper.java
+++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java
@@ -295,6 +295,15 @@ public abstract class DrawableWrapper extends Drawable implements Drawable.Callb
         }
     }
 
+    @Override
+    public ColorFilter getColorFilter() {
+        final Drawable drawable = getDrawable();
+        if (drawable != null) {
+            return drawable.getColorFilter();
+        }
+        return super.getColorFilter();
+    }
+
     @Override
     public void setTintList(@Nullable ColorStateList tint) {
         if (mDrawable != null) {