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

Commit 5d716cad authored by Jiaming Liu's avatar Jiaming Liu Committed by Android (Google) Code Review
Browse files

Merge "Cleanup drop input for AE during legacy transition" into main

parents b450cf1a 91101825

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

+1 −15
Original line number Diff line number Diff line
@@ -859,8 +859,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    /** The last set {@link DropInputMode} for this activity surface. */

    @DropInputMode

    private int mLastDropInputMode = DropInputMode.NONE;

    /** Whether the input to this activity will be dropped during the current playing animation. */

    private boolean mIsInputDroppedForAnimation;



    /**

     * Whether the application has desk mode resources. Calculated and cached when
@@ -1700,15 +1698,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

    }



    /** Sets if all input will be dropped as a protection during the client-driven animation. */

    void setDropInputForAnimation(boolean isInputDroppedForAnimation) {

        if (mIsInputDroppedForAnimation == isInputDroppedForAnimation) {

            return;

        }

        mIsInputDroppedForAnimation = isInputDroppedForAnimation;

        updateUntrustedEmbeddingInputProtection();

    }



    /**

     * Sets to drop input when obscured to activity if it is embedded in untrusted mode.

     *
@@ -1721,10 +1710,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (getSurfaceControl() == null) {

            return;

        }

        if (mIsInputDroppedForAnimation) {

            // Disable all input during the animation.

            setDropInputMode(DropInputMode.ALL);

        } else if (isEmbeddedInUntrustedMode()) {

        if (isEmbeddedInUntrustedMode()) {

            // Set drop input to OBSCURED when untrusted embedded.

            setDropInputMode(DropInputMode.OBSCURED);

        } else {

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

+1 −6
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ import android.view.SurfaceControl.Transaction; 
import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.common.LogLevel;

import com.android.internal.protolog.ProtoLog;

import com.android.internal.protolog.common.LogLevel;

import com.android.internal.util.FastPrintWriter;

import com.android.server.wm.SurfaceAnimator.AnimationType;

import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;
@@ -53,7 +53,6 @@ import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback; 
import java.io.PrintWriter;

import java.io.StringWriter;

import java.util.ArrayList;

import java.util.function.Consumer;



/**

 * Helper class to run app animations in a remote process.
@@ -349,10 +348,6 @@ class RemoteAnimationController implements DeathRecipient { 
            } finally {

                mIsFinishing = false;

            }

            // Reset input for all activities when the remote animation is finished.

            final Consumer<ActivityRecord> updateActivities =

                    activity -> activity.setDropInputForAnimation(false);

            mDisplayContent.forAllActivities(updateActivities);

        }

        setRunningRemoteAnimation(false);

        ProtoLog.i(WM_DEBUG_REMOTE_ANIMATIONS, "Finishing remote animation");