Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f165ec3 authored by Bryce Lee's avatar Bryce Lee
Browse files

Do not consider implicit lifecycle observers. 

JavaAdapter#collectFlow creates a lifecycle observer for the coroutine
scope that is removed upon the flow close. This happens after destroy,
causing tests verifying its removal at this stage to fail.

This changelist filters out the associated observer from the list of
observers whose removal is tracked.

Test: atest TouchMonitorTest#testDestroy_cleansUpLifecycleObserver
Flag: com.android.systemui.ambient_touch_monitor_listen_to_display_changes
Fixes: 350076145
Change-Id: I13805f4fafe77ba4bf073ead9f2dbb6fa6008aa0
parent 0b8d6213

packages/SystemUI/tests/src/com/android/systemui/ambient/touch/TouchMonitorTest.java

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.view.WindowMetrics; 


import androidx.annotation.NonNull;

import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleCoroutineScope;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.LifecycleOwner;

import androidx.lifecycle.LifecycleRegistry;
@@ -159,7 +160,9 @@ public class TouchMonitorTest extends SysuiTestCase { 
            ArgumentCaptor<LifecycleObserver> observerCaptor =

                    ArgumentCaptor.forClass(LifecycleObserver.class);

            verify(mLifecycleRegistry, atLeast(1)).addObserver(observerCaptor.capture());

            mLifecycleObservers.addAll(observerCaptor.getAllValues());

            mLifecycleObservers.addAll(observerCaptor.getAllValues().stream().filter(

                    lifecycleObserver -> !(lifecycleObserver instanceof LifecycleCoroutineScope))

                    .toList());



            updateLifecycle(Lifecycle.State.RESUMED);