diff options
| author | 2022-02-28 15:45:52 +0000 | |
|---|---|---|
| committer | 2022-02-28 16:16:23 +0000 | |
| commit | 13c21a5ccf2a4982279d2c5ceecc92457ad2e67f (patch) | |
| tree | 15cd91c4b534c984a68fee95c70db7b7f8e5adef | |
| parent | 09076f0af2715438fd5ceeb052424f1ee0c936cf (diff) | |
Use isInTransition() to detect animations
Shell transitions and isAnimating aren't friends. isInTransition
captures both legacy animations and shell transitions
Bug: 208662670
Bug: 216199003
Test: atest android.server.wm.WindowUntrustedTouchTest (with and without
shell transitions enabled)
Change-Id: I0b7595d2ff69205ed7ffaf2f647677cabe6edde8
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecordInputSink.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java index 316bf2017585..19d5449254ff 100644 --- a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java +++ b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java @@ -16,10 +16,6 @@ package com.android.server.wm; -import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION; -import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS; -import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; - import android.app.compat.CompatChanges; import android.compat.annotation.ChangeId; import android.os.IBinder; @@ -101,8 +97,7 @@ class ActivityRecordInputSink { mToken = inputChannel.getToken(); mInputEventReceiver = createInputEventReceiver(inputChannel); } - if (mDisabled || !mIsCompatEnabled || mActivityRecord.isAnimating(TRANSITION | PARENTS, - ANIMATION_TYPE_APP_TRANSITION)) { + if (mDisabled || !mIsCompatEnabled || mActivityRecord.isInTransition()) { // TODO(b/208662670): Investigate if we can have feature active during animations. mInputWindowHandleWrapper.setToken(null); } else { |