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

Merge "Use isInTransition() to detect animations" into tm-dev

Browse Source
This commit is contained in:
Linus Tufvesson
2022-03-01 12:13:15 +00:00
committed by Android (Google) Code Review
parent 1a337e9ce5 13c21a5ccf
commit b35f48c808
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityRecordInputSink.java
View File

@@ -16,10 +16,6 @@
package com.android.server.wm; 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.app.compat.CompatChanges;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.os.IBinder; import android.os.IBinder;
@@ -101,8 +97,7 @@ class ActivityRecordInputSink {
mToken = inputChannel.getToken(); mToken = inputChannel.getToken();
mInputEventReceiver = createInputEventReceiver(inputChannel); mInputEventReceiver = createInputEventReceiver(inputChannel);
} }
if (mDisabled || !mIsCompatEnabled || mActivityRecord.isAnimating(TRANSITION | PARENTS, if (mDisabled || !mIsCompatEnabled || mActivityRecord.isInTransition()) {
ANIMATION_TYPE_APP_TRANSITION)) {
// TODO(b/208662670): Investigate if we can have feature active during animations. // TODO(b/208662670): Investigate if we can have feature active during animations.
mInputWindowHandleWrapper.setToken(null); mInputWindowHandleWrapper.setToken(null);
} else { } else {