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

Commit b9ce738b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove com.android.window.flags.remove_activity_starter_dream_callback flag" into main

parents 0eb48e73 bcff748b

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

+0 −11
Original line number Diff line number Diff line
@@ -92,17 +92,6 @@ flag { 
  bug: "294925498"

}



flag {

    name: "remove_activity_starter_dream_callback"

    namespace: "windowing_frontend"

    description: "Avoid a race with DreamManagerService callbacks for isDreaming by checking Activity state directly"

    bug: "366452352"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

    is_fixed_read_only: true

}



flag {

  name: "do_not_force_wallpaper_for_freeform_task"

  namespace: "windowing_frontend"

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

+5 −22
Original line number Diff line number Diff line
@@ -1942,17 +1942,6 @@ class ActivityStarter { 
        computeLaunchingTaskFlags();

        mIntent.setFlags(mLaunchFlags);



        boolean dreamStopping = false;

        if (!com.android.window.flags.Flags.removeActivityStarterDreamCallback()) {

            for (ActivityRecord stoppingActivity : mSupervisor.mStoppingActivities) {

                if (stoppingActivity.getActivityType()

                        == WindowConfiguration.ACTIVITY_TYPE_DREAM) {

                    dreamStopping = true;

                    break;

                }

            }

        }



        // Get top task at beginning because the order may be changed when reusing existing task.

        final Task prevTopRootTask = mPreferredTaskDisplayArea.getFocusedRootTask();

        final Task prevTopTask = prevTopRootTask != null ? prevTopRootTask.getTopLeafTask() : null;
@@ -2080,17 +2069,11 @@ class ActivityStarter { 
                mTargetRootTask.getRootTask().moveToFront("reuseOrNewTask", targetTask);



                final boolean launchBehindDream;

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

                final TaskDisplayArea tda = mTargetRootTask.getTaskDisplayArea();

                final Task top = (tda != null ? tda.getTopRootTask() : null);

                launchBehindDream = (top != null && top != mTargetRootTask)

                        && top.getActivityType() == WindowConfiguration.ACTIVITY_TYPE_DREAM

                        && top.getTopNonFinishingActivity() != null;

                } else {

                    launchBehindDream = !mTargetRootTask.isTopRootTaskInDisplayArea()

                            && mService.isDreaming()

                            && !dreamStopping;

                }



                if (launchBehindDream) {

                    // Launching underneath dream activity (fullscreen, always-on-top). Run the