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

Commit c7d5e7fe authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Do not consider implicit lifecycle observers." into main

parents b1e68f98 5f165ec3

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);