From ca556363be24a804eaae98ec4a259a27edb955b5 Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Wed, 10 Mar 2021 14:31:45 -0500
Subject: [PATCH] ColorFilter::getFlags() is deprecated

See https://skia-review.googlesource.com/c/skia/+/382702

Test: make

Bug: 178700363
Change-Id: I0ae9d19439ea577c002463145b9f8404b4201f1b
---
 libs/hwui/utils/PaintUtils.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libs/hwui/utils/PaintUtils.h b/libs/hwui/utils/PaintUtils.h
index 09c6a4fdf50d2..a8f2d9a28d671 100644
--- a/libs/hwui/utils/PaintUtils.h
+++ b/libs/hwui/utils/PaintUtils.h
@@ -52,18 +52,10 @@ public:
         return mode == SkBlendMode::kSrcOver || mode == SkBlendMode::kSrc;
     }
 
-    static bool isBlendedShader(const SkShader* shader) {
-        if (shader == nullptr) {
-            return false;
-        }
-        return !shader->isOpaque();
-    }
+    static bool isBlendedShader(const SkShader* shader) { return shader && !shader->isOpaque(); }
 
     static bool isBlendedColorFilter(const SkColorFilter* filter) {
-        if (filter == nullptr) {
-            return false;
-        }
-        return (filter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag) == 0;
+        return filter && !filter->isAlphaUnchanged();
     }
 
     static inline SkBlendMode getBlendModeDirect(const SkPaint* paint) {