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

Commit c9d7def8 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Revert "Override behavior for overview temporarily" 

This reverts commit bceca006.

Reason for revert: Droid-monitored triggered revert due to likely culprit for breakages in b/329652030. Will be verifying through ABTD before submitting the revert.

Change-Id: Ic74cd8dd767d8e3bb64e65514c919070271dc182
parent bceca006

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

+1 −11
Original line number Original line Diff line number Diff line
@@ -328,7 +328,6 @@ import android.os.Process; 
import android.os.RemoteCallbackList;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserHandle;

import android.service.contentcapture.ActivityEvent;

import android.service.contentcapture.ActivityEvent;
@@ -1004,10 +1003,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    // Whether the Activity allows state sharing in untrusted embedding

    // Whether the Activity allows state sharing in untrusted embedding

    private final boolean mAllowUntrustedEmbeddingStateSharing;

    private final boolean mAllowUntrustedEmbeddingStateSharing;





    // TODO(b/329378309): Remove this once the overview handles the configuration correctly.

    private static final boolean OVERRIDE_OVERVIEW_CONFIGURATION =

            SystemProperties.getBoolean("persist.wm.debug.override_overview_configuration", true);



    // Records whether client has overridden the WindowAnimation_(Open/Close)(Enter/Exit)Animation.

    // Records whether client has overridden the WindowAnimation_(Open/Close)(Enter/Exit)Animation.

    private CustomAppTransition mCustomOpenTransition;

    private CustomAppTransition mCustomOpenTransition;

    private CustomAppTransition mCustomCloseTransition;

    private CustomAppTransition mCustomCloseTransition;
@@ -8610,12 +8605,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (rotation == ROTATION_UNDEFINED && !isFixedRotationTransforming()) {

        if (rotation == ROTATION_UNDEFINED && !isFixedRotationTransforming()) {

            rotation = mDisplayContent.getRotation();

            rotation = mDisplayContent.getRotation();

        }

        }

        final int activityType = inOutConfig.windowConfiguration.getActivityType();

        if (!mWmService.mFlags.mInsetsDecoupledConfiguration

        if (OVERRIDE_OVERVIEW_CONFIGURATION

                && (activityType == ACTIVITY_TYPE_HOME || activityType == ACTIVITY_TYPE_RECENTS)) {

            // Do not early return and provide the override. This should be removed shortly as we

            // don't override 1P components.

        } else if (!mWmService.mFlags.mInsetsDecoupledConfiguration

                || info.isChangeEnabled(INSETS_DECOUPLED_CONFIGURATION_ENFORCED)

                || info.isChangeEnabled(INSETS_DECOUPLED_CONFIGURATION_ENFORCED)

                || getCompatDisplayInsets() != null

                || getCompatDisplayInsets() != null

                || isFloating(parentWindowingMode) || fullBounds == null

                || isFloating(parentWindowingMode) || fullBounds == null