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

Commit ef8a0f11 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Provide a quick workaround for WM flaky tests" into sc-dev am: d2ca79d4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14502543

Change-Id: I2971a0fc0934ef6099978adff8274491b206f46f
parents e50c17df d2ca79d4

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

+5 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.os.Binder; 
import android.os.IBinder;

import android.os.Parcel;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.view.SurfaceControl;
@@ -75,6 +76,9 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
    private static final int REPORT_CONFIGS = CONTROLLABLE_CONFIGS;

    private static final int REPORT_WINDOW_CONFIGS = CONTROLLABLE_WINDOW_CONFIGS;



    private static final boolean DEBUG_ENABLE_REVEAL_ANIMATION =

            SystemProperties.getBoolean("persist.debug.enable_reveal_animation", false);



    // The set of modes that are currently supports

    // TODO: Remove once the task organizer can support all modes

    @VisibleForTesting
@@ -183,7 +187,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
            SurfaceControl windowAnimationLeash = null;

            Rect mainFrame = null;

            final boolean playShiftUpAnimation = !task.inMultiWindowMode();

            if (prepareAnimation && playShiftUpAnimation) {

            if (prepareAnimation && playShiftUpAnimation && DEBUG_ENABLE_REVEAL_ANIMATION) {

                final ActivityRecord topActivity = task.topActivityWithStartingWindow();

                if (topActivity != null) {

                    final WindowState mainWindow =