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

Commit ef800dd6 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Fix TaskInfo#requestedVisibleTypes update conditions" into main

parents 4e4a7616 8273c50a

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

+4 −0
Original line number Diff line number Diff line
@@ -706,6 +706,10 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 
                win.setRequestedVisibleTypes(requestedVisibleTypes);

                win.getDisplayContent().getInsetsPolicy().onRequestedVisibleTypesChanged(win,

                        imeStatsToken);

                final Task task = win.getTask();

                if (task != null) {

                    task.dispatchTaskInfoChangedIfNeeded(/* forced= */ true);

                }

            } else {

                EmbeddedWindowController.EmbeddedWindow embeddedWindow = null;

                if (android.view.inputmethod.Flags.refactorInsetsController()) {

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

+2 −1
Original line number Diff line number Diff line
@@ -3436,7 +3436,8 @@ class Task extends TaskFragment { 
        info.isSleeping = shouldSleepActivities();

        info.isTopActivityTransparent = top != null && !top.fillsParent();

        info.lastNonFullscreenBounds = topTask.mLastNonFullscreenBounds;

        final WindowState windowState = top != null ? top.findMainWindow() : null;

        final WindowState windowState = top != null

                ? top.findMainWindow(/* includeStartingApp= */ false) : null;

        info.requestedVisibleTypes = (windowState != null && Flags.enableFullyImmersiveInDesktop())

                ? windowState.getRequestedVisibleTypes() : WindowInsets.Type.defaultVisible();

        AppCompatUtils.fillAppCompatTaskInfo(this, info, top);