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

Commit 13c21a5c authored by Linus Tufvesson's avatar Linus Tufvesson
Browse files

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
parent 09076f0a

services/core/java/com/android/server/wm/ActivityRecordInputSink.java

+1 −6
Original line number Diff line number Diff line
@@ -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 {