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

Commit 01358ba3 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Remove enabled flag use_visible_requested_for_process_tracker 

Bug: 414269923
Flag: EXEMPT flag removal
Test: BackgroundActivityLaunchTest
Change-Id: I61169d7adafbb8c43a9a1e97fe963cfe50bb90ad
parent a21b506c

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -275,17 +275,6 @@ flag { 
  }

}



flag {

  name: "use_visible_requested_for_process_tracker"

  namespace: "windowing_frontend"

  description: "Do not count closing activity as visible process"

  bug: "396653764"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "ensure_keyguard_does_transition_starting"

  namespace: "windowing_frontend"

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

+3 −9
Original line number Diff line number Diff line
@@ -337,11 +337,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
    public static final int ACTIVITY_STATE_FLAG_VISIBLE_MULTI_WINDOW_MODE = 1 << 25;

    public static final int ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER = 0x0000ffff;



    private static final int ACTIVITY_STATE_VISIBLE =

            com.android.window.flags.Flags.useVisibleRequestedForProcessTracker()

                    ? ACTIVITY_STATE_FLAG_IS_VISIBLE

                    : ACTIVITY_STATE_FLAG_IS_VISIBLE | ACTIVITY_STATE_FLAG_IS_WINDOW_VISIBLE;



    /**

     * The state for oom-adjustment calculation. The higher 16 bits are the activity states, and the

     * lower 16 bits are the task layer rank (see {@link Task#mLayerRank}). This field is written by
@@ -1263,7 +1258,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
        int nonOccludedRatio = 0;

        long perceptibleTaskStoppedTimeMillis = Long.MIN_VALUE;

        final boolean wasResumed = hasResumedActivity();

        final boolean wasAnyVisible = (mActivityStateFlags & ACTIVITY_STATE_VISIBLE) != 0;

        final boolean wasAnyVisible = (mActivityStateFlags & ACTIVITY_STATE_FLAG_IS_VISIBLE) != 0;

        for (int i = mActivities.size() - 1; i >= 0; i--) {

            final ActivityRecord r = mActivities.get(i);

            if (r.isVisible()) {
@@ -1306,8 +1301,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
                    bestInvisibleState = PAUSING;

                    // Treat PAUSING as visible in case the next activity in the same process has

                    // not yet been set as visible-requested.

                    if (com.android.window.flags.Flags.useVisibleRequestedForProcessTracker()

                            && r.isVisible()) {

                    if (r.isVisible()) {

                        stateFlags |= ACTIVITY_STATE_FLAG_IS_VISIBLE;

                    }

                } else if (state == PAUSED) {
@@ -1359,7 +1353,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
        mActivityStateFlags = stateFlags;

        mPerceptibleTaskStoppedTimeMillis = perceptibleTaskStoppedTimeMillis;



        final boolean anyVisible = (stateFlags & ACTIVITY_STATE_VISIBLE) != 0;

        final boolean anyVisible = (stateFlags & ACTIVITY_STATE_FLAG_IS_VISIBLE) != 0;

        if (!wasAnyVisible && anyVisible) {

            mAtm.mVisibleActivityProcessTracker.onAnyActivityVisible(this);

            mAtm.mWindowManager.onProcessActivityVisibilityChanged(mUid, true /*visible*/);

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

+2 −6
Original line number Diff line number Diff line
@@ -383,12 +383,8 @@ public class WindowProcessControllerTests extends WindowTestsBase { 
        assertTrue(mWpc.hasForegroundActivities());



        activity.setVisibleRequested(false);

        if (com.android.window.flags.Flags.useVisibleRequestedForProcessTracker()) {

        assertTrue("PAUSING is visible", mWpc.hasVisibleActivities());

        activity.setState(PAUSED, "test");

        } else {

            activity.setVisible(false);

        }

        verify(tracker).onAllActivitiesInvisible(mWpc);

        assertFalse(mWpc.hasVisibleActivities());