Merge remote-tracking branch 'origin/main' into fix-instru-tests

* origin/main:
  Pin gradle/actions/wrapper-validation to commit SHA to satisfy code scanning
  Drop API 28 and 29 from instrumentation test matrix
  Fix LeakActivityTest on API 33+ by disabling notifications during test
  Fix INSTALL_FAILED_DEPRECATED_SDK_VERSION on API 28+ for leakcanary-android tests
  Upgrade wrapper-validation-action to gradle/actions/wrapper-validation@v4
  Add recent Android API levels to instrumentation test matrix
  Fix pkill self-match: use qemu-syste[m] pattern
  Update changelog entry wording for ToastEventListener fix
  Fix emulator process hanging 20+ min after CI tests finish
  Add changelog entry for ToastEventListener race condition fix
  Fix ToastEventListener race condition retaining finished Toast

Author: pyricau

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@48b5f213c81028ace310571dc5ec0fbbca0b2947 # v4
 
   checks:
     runs-on: ubuntu-latest
@@ -39,7 +39,9 @@ jobs:
           - 21
           - 23
           - 26
-          # - 29 flaky
+          - 31
+          - 33
+          - 34
         include:
           - arch: x86
             api-level: 16
@@ -49,11 +51,6 @@ jobs:
             api-level: 19
             target: google_apis
             channel: stable
-        # Failing (something about permissions maybe?
-        #  - arch: x86
-        #    api-level: 30
-        #    target: aosp_atd
-        #    channel: canary
     steps:
       - name: Enable KVM group perms
         run: |
@@ -102,6 +99,13 @@ jobs:
             chmod 777 emulator.log
             adb logcat >> emulator.log &
             ./gradlew leakcanary:leakcanary-android-core:connectedCheck leakcanary:leakcanary-android:connectedCheck leakcanary:leakcanary-android-instrumentation:connectedCheck --no-build-cache --no-daemon --stacktrace
+            # Force-kill the emulator before the action's post-step cleanup.
+            # On API 26 google_apis, the emulator process can hang for 20+ minutes after
+            # receiving adb emu kill, causing the job to hit its 30-minute timeout. Killing
+            # the qemu-system process here ensures the post-cleanup kill check exits immediately.
+            # The [m] bracket trick avoids pkill matching its own parent shell process
+            # (whose cmdline contains the literal string "qemu-system" as an argument).
+            pkill -9 -f "qemu-syste[m]" || true
       - name: Upload results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

docs/changelog.md

@@ -3,6 +3,10 @@
 
 Please thank our [contributors](https://github.com/square/leakcanary/graphs/contributors) 🙏 🙏 🙏.
 
+## Unreleased
+
+* 🔨 [#2802](https://github.com/square/leakcanary/pull/2802) Fix `ToastEventListener` race condition leak where LeakCanary's toast was leaking and triggering LeakCanary
+
 ## Version 3.0 Alpha 8 (2024-06-04)
 
 * Added support for proper hprof handling on heap growth detection failures. Also inlined some public collaborators to achieve that. We now have a single class that's a bit larger but also a lot more obvious.

leakcanary/leakcanary-android-core/src/main/java/leakcanary/ToastEventListener.kt

@@ -58,6 +58,7 @@ object ToastEventListener : EventListener {
       val inflater = LayoutInflater.from(resumedActivity)
       toast.view = inflater.inflate(R.layout.leak_canary_heap_dump_toast, null)
       toast.show()
+      toastCurrentlyShown = toast
 
       val toastIcon = toast.view!!.findViewById<View>(R.id.leak_canary_toast_icon)
       toastIcon.translationY = -iconSize.toFloat()
@@ -66,7 +67,6 @@ object ToastEventListener : EventListener {
         .translationY(0f)
         .setListener(object : AnimatorListenerAdapter() {
           override fun onAnimationEnd(animation: Animator) {
-            toastCurrentlyShown = toast
             waitingForToast.countDown()
           }
         })

leakcanary/leakcanary-android/build.gradle.kts

@@ -29,6 +29,8 @@ android {
 
   defaultConfig {
     minSdk = libs.versions.androidMinSdk.get().toInt()
+    // Avoid DeprecatedTargetSdkVersionDialog / INSTALL_FAILED_DEPRECATED_SDK_VERSION on API 28+
+    targetSdk = libs.versions.androidCompileSdk.get().toInt()
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures.buildConfig = false

leakcanary/leakcanary-android/src/androidTest/java/leakcanary/LeakActivityTest.kt

@@ -41,11 +41,16 @@ internal class LeakActivityTest {
   fun importHeapDumpFile() = tryAndRestoreConfig {
     val latch = CountDownLatch(1)
     LeakCanary.config = LeakCanary.config.run {
-      copy(eventListeners = eventListeners + EventListener { event ->
-        if (event is HeapAnalysisDone<*>) {
-          latch.countDown()
+      copy(
+        // Disable notifications to prevent RequestPermissionActivity from launching on API 33+
+        // (targetSdk >= 33 triggers POST_NOTIFICATIONS permission request which pauses LeakActivity)
+        showNotifications = false,
+        eventListeners = eventListeners + EventListener { event ->
+          if (event is HeapAnalysisDone<*>) {
+            latch.countDown()
+          }
         }
-      })
+      )
     }
     val hprof = writeHeapDump {
       "Holder" clazz {