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

Commit 16c527d1 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Fix some issues with applySyncTransaction" into rvc-dev am: 79cb7810 am: e2117993 

Change-Id: I729a626d0cfb932a4b6ccde4e40a31d5716de6bc
parents 378a79ff e2117993

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import static android.Manifest.permission.MANAGE_ACTIVITY_STACKS;

import static android.Manifest.permission.MANAGE_ACTIVITY_STACKS;





import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.ActivityTaskManagerService.LAYOUT_REASON_CONFIG_CHANGED;

import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_TASK_ORG;

import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_TASK_ORG;

import static com.android.server.wm.WindowContainer.POSITION_BOTTOM;

import static com.android.server.wm.WindowContainer.POSITION_BOTTOM;

import static com.android.server.wm.WindowContainer.POSITION_TOP;

import static com.android.server.wm.WindowContainer.POSITION_TOP;
@@ -173,6 +174,10 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                            f.recycle();

                            f.recycle();

                        }

                        }

                    }

                    }



                    if ((effects & TRANSACT_EFFECTS_CLIENT_CONFIG) == 0) {

                        mService.addWindowLayoutReasons(LAYOUT_REASON_CONFIG_CHANGED);

                    }

                } finally {

                } finally {

                    mService.continueWindowLayout();

                    mService.continueWindowLayout();

                    if (syncId >= 0) {

                    if (syncId >= 0) {

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -2114,6 +2114,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    void removeIfPossible() {

    void removeIfPossible() {

        super.removeIfPossible();

        super.removeIfPossible();

        removeIfPossible(false /*keepVisibleDeadWindow*/);

        removeIfPossible(false /*keepVisibleDeadWindow*/);

        finishDrawing(null);

    }

    }





    private void removeIfPossible(boolean keepVisibleDeadWindow) {

    private void removeIfPossible(boolean keepVisibleDeadWindow) {
@@ -3454,7 +3455,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        final Rect visibleInsets = mWindowFrames.mLastVisibleInsets;

        final Rect visibleInsets = mWindowFrames.mLastVisibleInsets;

        final Rect stableInsets = mWindowFrames.mLastStableInsets;

        final Rect stableInsets = mWindowFrames.mLastStableInsets;

        final MergedConfiguration mergedConfiguration = mLastReportedConfiguration;

        final MergedConfiguration mergedConfiguration = mLastReportedConfiguration;

        final boolean reportDraw = mWinAnimator.mDrawState == DRAW_PENDING;

        final boolean reportDraw = mWinAnimator.mDrawState == DRAW_PENDING || useBLASTSync();

        final boolean forceRelayout = reportOrientation || isDragResizeChanged();

        final boolean forceRelayout = reportOrientation || isDragResizeChanged();

        final int displayId = getDisplayId();

        final int displayId = getDisplayId();

        final DisplayCutout displayCutout = getWmDisplayCutout().getDisplayCutout();

        final DisplayCutout displayCutout = getWmDisplayCutout().getDisplayCutout();