From ffb8bd5dbe54e9c2918d62c76b0bb3678fac4f5b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Ricau <py@squareup.com>
Date: Thu, 10 Nov 2022 11:51:15 -0800
Subject: [PATCH] Report AnimationHandler leak

Fixes #2438
---
 shark-android/api/shark-android.api             |  1 +
 .../main/java/shark/AndroidReferenceMatchers.kt | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/shark-android/api/shark-android.api b/shark-android/api/shark-android.api
index 1eef9edc80..34fbfb2e61 100644
--- a/shark-android/api/shark-android.api
+++ b/shark-android/api/shark-android.api
@@ -71,6 +71,7 @@ public abstract class shark/AndroidReferenceMatchers : java/lang/Enum {
 	public static final field ACTIVITY_MANAGER_MCONTEXT Lshark/AndroidReferenceMatchers;
 	public static final field ACTIVITY_THREAD__M_NEW_ACTIVITIES Lshark/AndroidReferenceMatchers;
 	public static final field ACTIVITY_TRANSITION_STATE__M_EXITING_TO_VIEW Lshark/AndroidReferenceMatchers;
+	public static final field ANIMATION_HANDLER__ANIMATOR_REQUESTORS Lshark/AndroidReferenceMatchers;
 	public static final field APPLICATION_PACKAGE_MANAGER__HAS_SYSTEM_FEATURE_QUERY Lshark/AndroidReferenceMatchers;
 	public static final field APP_OPS_MANAGER__CALLBACK_STUB Lshark/AndroidReferenceMatchers;
 	public static final field APP_WIDGET_HOST_CALLBACKS Lshark/AndroidReferenceMatchers;
diff --git a/shark-android/src/main/java/shark/AndroidReferenceMatchers.kt b/shark-android/src/main/java/shark/AndroidReferenceMatchers.kt
index 6beb36f908..836ab748be 100644
--- a/shark-android/src/main/java/shark/AndroidReferenceMatchers.kt
+++ b/shark-android/src/main/java/shark/AndroidReferenceMatchers.kt
@@ -866,6 +866,23 @@ enum class AndroidReferenceMatchers {
     }
   },
 
+  ANIMATION_HANDLER__ANIMATOR_REQUESTORS {
+    override fun add(
+      references: MutableList<ReferenceMatcher>
+    ) {
+      references += instanceFieldLeak(
+        "android.animation.AnimationHandler", "mAnimatorRequestors",
+        description = """
+          AnimationHandler is a singleton holding an activity ViewRootImpl requestor after the
+          activity has been destroyed.
+          Report: https://issuetracker.google.com/issues/258534826
+        """.trimIndent()
+      ) {
+        sdkInt == 33
+      }
+    }
+  },
+
   // ######## Manufacturer specific known leaks ########
 
   // SAMSUNG