Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't run remote animations before sysui is ready" into udc-dev

Browse Source
This commit is contained in:
Matt Pietal
2023-06-02 15:25:32 +00:00
committed by Android (Google) Code Review
parent 634673bca6 6466862f5f
commit 06b3270ff2
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -94,7 +94,6 @@ import android.view.WindowManager;
import android.view.WindowManagerPolicyConstants; import android.view.WindowManagerPolicyConstants;
import android.view.animation.Animation; import android.view.animation.Animation;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.window.IRemoteTransition;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@@ -162,7 +161,6 @@ import dagger.Lazy;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
/** /**
@@ -1913,19 +1911,19 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
public IRemoteAnimationRunner getExitAnimationRunner() { public IRemoteAnimationRunner getExitAnimationRunner() {
return mExitAnimationRunner; return validatingRemoteAnimationRunner(mExitAnimationRunner);
} }
public IRemoteAnimationRunner getOccludeAnimationRunner() { public IRemoteAnimationRunner getOccludeAnimationRunner() {
return mOccludeAnimationRunner; return validatingRemoteAnimationRunner(mOccludeAnimationRunner);
} }
public IRemoteAnimationRunner getOccludeByDreamAnimationRunner() { public IRemoteAnimationRunner getOccludeByDreamAnimationRunner() {
return mOccludeByDreamAnimationRunner; return validatingRemoteAnimationRunner(mOccludeByDreamAnimationRunner);
} }
public IRemoteAnimationRunner getUnoccludeAnimationRunner() { public IRemoteAnimationRunner getUnoccludeAnimationRunner() {
return mUnoccludeAnimationRunner; return validatingRemoteAnimationRunner(mUnoccludeAnimationRunner);
} }
public boolean isHiding() { public boolean isHiding() {
@@ -3439,6 +3437,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
Trace.traceCounter(Trace.TRACE_TAG_APP, "pendingLock", mPendingLock ? 1 : 0); Trace.traceCounter(Trace.TRACE_TAG_APP, "pendingLock", mPendingLock ? 1 : 0);
} }
private boolean isViewRootReady() {
return mKeyguardViewControllerLazy.get().getViewRootImpl() != null;
}
public void addStateMonitorCallback(IKeyguardStateCallback callback) { public void addStateMonitorCallback(IKeyguardStateCallback callback) {
synchronized (this) { synchronized (this) {
mKeyguardStateCallbacks.add(callback); mKeyguardStateCallbacks.add(callback);
@@ -3541,4 +3543,27 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_OCCLUSION); 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);
}
};
}
} }