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

Commit b35f48c8 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

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

parents 1a337e9c 13c21a5c

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

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