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

Commit 4ee97aa4 authored by wilsonshih's avatar wilsonshih
Browse files

Fix transfer splash screen view been called twice from onDraw 

postOnAnimation is not robust enough from remove the onDrawListener
before next traversal, add a flag to to ensure that transfer splash
screen view only been called once.

Bug: 204125440
Test: atest SplashscreenTests
Test: verify SplashScreenTests and SplashscreenParametrizedTest pass
Change-Id: Id0e6d57b901b2dae45f5aa77e5571f9cf81b6e29
parent cfba62de

core/java/android/app/ActivityThread.java

+6 −1
Original line number Diff line number Diff line
@@ -4178,15 +4178,20 @@ public final class ActivityThread extends ClientTransactionHandler 
        view.requestLayout();



        view.getViewTreeObserver().addOnDrawListener(new ViewTreeObserver.OnDrawListener() {

            private boolean mHandled = false;

            @Override

            public void onDraw() {

                if (mHandled) {

                    return;

                }

                mHandled = true;

                // Transfer the splash screen view from shell to client.

                // Call syncTransferSplashscreenViewTransaction at the first onDraw so we can ensure

                // the client view is ready to show and we can use applyTransactionOnDraw to make

                // all transitions happen at the same frame.

                syncTransferSplashscreenViewTransaction(

                        view, r.token, decorView, startingWindowLeash);

                view.postOnAnimation(() -> view.getViewTreeObserver().removeOnDrawListener(this));

                view.post(() -> view.getViewTreeObserver().removeOnDrawListener(this));

            }

        });

    }