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

Commit 9a9e3639 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Clean up splash_screen_view_sync_transaction flag" into main

parents 013d1c54 d10fe50a

core/java/android/app/ActivityThread.java

+1 −11
Original line number Diff line number Diff line
@@ -4975,11 +4975,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        final SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();

        transaction.hide(startingWindowLeash);

        startingWindowLeash.release();

        final boolean syncTransactionOnDraw =

                com.android.window.flags.Flags.splashScreenViewSyncTransaction();

        if (syncTransactionOnDraw) {

        decorView.getViewRootImpl().applyTransactionOnDraw(transaction);

        }

        view.syncTransferSurfaceOnDraw();



        if (decorView.isHardwareAccelerated()) {
@@ -4992,9 +4988,6 @@ public final class ActivityThread extends ClientTransactionHandler 
                                int syncResult, long frame) {

                            return didProduceBuffer -> {

                                Trace.instant(Trace.TRACE_TAG_VIEW, "transferSplashscreenView");

                                if (!syncTransactionOnDraw) {

                                    transaction.apply();

                                }

                                // Tell server we can remove the starting window after frame commit.

                                decorView.postOnAnimation(() ->

                                        reportSplashscreenViewShown(token, view));
@@ -5003,9 +4996,6 @@ public final class ActivityThread extends ClientTransactionHandler 
                    });

        } else {

            Trace.instant(Trace.TRACE_TAG_VIEW, "transferSplashscreenView_software");

            if (!syncTransactionOnDraw) {

                decorView.getViewRootImpl().applyTransactionOnDraw(transaction);

            }

            // Tell server we can remove the starting window after frame commit.

            decorView.postOnAnimation(() -> reportSplashscreenViewShown(token, view));

        }

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

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

}



flag {

    name: "splash_screen_view_sync_transaction"

    namespace: "windowing_frontend"

    description: "Fixes flickering when transfer splash screen view to client."

    bug: "402644135"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "wear_frameworks"

    name: "dispatch_first_keyguard_locked_state"

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

+1 −3
Original line number Diff line number Diff line
@@ -619,9 +619,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
            return null;

        }

        t.setPosition(leash, window.mSurfacePosition.x, window.mSurfacePosition.y);

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

        t.apply();

        }

        return leash;

    }