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

Commit db115d46 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

TrustedPresentationListener: Fix occlusion calculation for invisible windows 

TrustedPresentationListener (TPL) incorrectly computed occlusion without considering window visibility. This led to potential issues, especially with windows like the IME window, which can remain invisible but still present in the window list.

Future changes will prevent invisible windows from being passed to TPL and input, mitigating similar problems.

Fixes: 404598904
Test: presubmit
Flag: EXEMPT bug fix
Change-Id: I3f61397c5facc54634fec16706b1216d1dbdc69c
parent 03ee1803

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

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.graphics.Region; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.InputConfig;

import android.os.RemoteException;

import android.util.ArrayMap;

import android.util.IntArray;
@@ -260,8 +261,9 @@ public class TrustedPresentationListenerController { 
        ArrayMap<ITrustedPresentationListener, Pair<IntArray, IntArray>> listenerUpdates =

                new ArrayMap<>();

        for (var windowHandle : mLastWindowHandles.first) {

            if (!windowHandle.canOccludePresentation) {

                ProtoLog.v(WM_DEBUG_TPL, "Skipping %s", windowHandle.name);

            var isInvisible = ((windowHandle.inputConfig & InputConfig.NOT_VISIBLE)

                    == InputConfig.NOT_VISIBLE);

            if (!windowHandle.canOccludePresentation || isInvisible) {

                continue;

            }

            int displayId = INVALID_DISPLAY;