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

Commit 81f30aa7 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Start client only if requested when ensuring activity visibility" into main

parents e68e2026 2fe88b50

services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ class EnsureActivitiesVisibleHelper { 
            }

            r.setVisibility(true);

        }

        if (r != starting) {

        if (r != starting && mNotifyClients) {

            mTaskFragment.mTaskSupervisor.startSpecificActivity(r, andResume,

                    true /* checkConfig */);

        }

services/tests/wmtests/src/com/android/server/wm/TaskTests.java

+9 −0
Original line number Diff line number Diff line
@@ -390,6 +390,15 @@ public class TaskTests extends WindowTestsBase { 
        rootTask.ensureActivitiesVisible(null /* starting */);

        assertTrue(activity1.isVisible());

        assertTrue(activity2.isVisible());



        // If notifyClients is false, it should only update the state without starting the client.

        activity1.setVisible(false);

        activity1.setVisibleRequested(false);

        activity1.detachFromProcess();

        rootTask.ensureActivitiesVisible(null /* starting */, false /* notifyClients */);

        verify(mSupervisor, never()).startSpecificActivity(eq(activity1),

                anyBoolean() /* andResume */, anyBoolean() /* checkConfig */);

        assertTrue(activity1.isVisibleRequested());

    }



    @Test