commit 63985967cb99c02496368d69bbad4ccf015ea8ec
author Sunny Goyal <sunnygoyal@google.com> Wed Aug 03 23:17:06 2022 +0000
committer Sunny Goyal <sunnygoyal@google.com> Wed Aug 03 23:17:55 2022 +0000
tree 1ebbf8529c2b0bf72d9e84ffbe441c89752664f3
parent a745ebf39c0ea5182469ebedddae76ca46fc0e5b

Fixing getSafeZone() method in AdaptiveIcon

Bug: 240335326
Test: atest FrameworksCoreTests:android.graphics.drawable.IconTest#testWithAdaptiveBitmap -- --abi x86_64
Change-Id: I1204bd759a347a9635dfb48e71ff65cef1f75f9d

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

diff --git a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
index 6939a72..47de37d 100644
--- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
+++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
@@ -359,10 +359,10 @@
     /** @hide */
     @TestApi
     public Region getSafeZone() {
-        mMaskMatrix.reset();
+        Path mask = getIconMask();
         mMaskMatrix.setScale(SAFEZONE_SCALE, SAFEZONE_SCALE, getBounds().centerX(), getBounds().centerY());
         Path p = new Path();
-        mMask.transform(mMaskMatrix, p);
+        mask.transform(mMaskMatrix, p);
         Region safezoneRegion = new Region(getBounds());
         safezoneRegion.setPath(p, safezoneRegion);
         return safezoneRegion;