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

Commit 6466862f authored by Matt Pietal's avatar Matt Pietal
Browse files

Don't run remote animations before sysui is ready 

At seen in logs, a remote animation may be triggered before sysui is
setup - before a root view has been bound. In this case, ignore the
transition.

Fixes: 284199412
Test: manual
Change-Id: I480992e462df8fb8929d4ff304d2203c370fe84b
parent 9ea64297

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+31 −6
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ import android.view.WindowManager; 
import android.view.WindowManagerPolicyConstants;

import android.view.animation.Animation;

import android.view.animation.AnimationUtils;

import android.window.IRemoteTransition;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -161,7 +160,6 @@ import dagger.Lazy; 
import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Optional;

import java.util.concurrent.Executor;



/**
@@ -1902,19 +1900,19 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
    }



    public IRemoteAnimationRunner getExitAnimationRunner() {

        return mExitAnimationRunner;

        return validatingRemoteAnimationRunner(mExitAnimationRunner);

    }



    public IRemoteAnimationRunner getOccludeAnimationRunner() {

        return mOccludeAnimationRunner;

        return validatingRemoteAnimationRunner(mOccludeAnimationRunner);

    }



    public IRemoteAnimationRunner getOccludeByDreamAnimationRunner() {

        return mOccludeByDreamAnimationRunner;

        return validatingRemoteAnimationRunner(mOccludeByDreamAnimationRunner);

    }



    public IRemoteAnimationRunner getUnoccludeAnimationRunner() {

        return mUnoccludeAnimationRunner;

        return validatingRemoteAnimationRunner(mUnoccludeAnimationRunner);

    }



    public boolean isHiding() {
@@ -3428,6 +3426,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        Trace.traceCounter(Trace.TRACE_TAG_APP, "pendingLock", mPendingLock ? 1 : 0);

    }



    private boolean isViewRootReady() {

        return mKeyguardViewControllerLazy.get().getViewRootImpl() != null;

    }



    public void addStateMonitorCallback(IKeyguardStateCallback callback) {

        synchronized (this) {

            mKeyguardStateCallbacks.add(callback);
@@ -3530,4 +3532,27 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
            mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_OCCLUSION);

        }

    }



    private IRemoteAnimationRunner validatingRemoteAnimationRunner(IRemoteAnimationRunner wrapped) {

        return new IRemoteAnimationRunner.Stub() {

            @Override

            public void onAnimationCancelled() throws RemoteException {

                wrapped.onAnimationCancelled();

            }



            @Override

            public void onAnimationStart(int transit, RemoteAnimationTarget[] apps,

                                         RemoteAnimationTarget[] wallpapers,

                                         RemoteAnimationTarget[] nonApps,

                                         IRemoteAnimationFinishedCallback finishedCallback)

                    throws RemoteException {

                if (!isViewRootReady()) {

                    Log.w(TAG, "Skipping remote animation - view root not ready");

                    return;

                }



                wrapped.onAnimationStart(transit, apps, wallpapers, nonApps, finishedCallback);

            }

        };

    }

}