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

Commit 11aa75e7 authored by Jacky Kao's avatar Jacky Kao
Browse files

Fix flaky issue 

To avoid the display content of the virtual display still not be created
when setting the windowsForA11yCallback of this one, using the method,
getDisplayContentOrCreate(), to create the display content if not
existing.

Bug: 144845224
Test: atest --iterations 20
AccessibilityWindowReportingTest#
moveFocusToAnotherDisplay_movesActiveAndFocusWindow
Test: a11y CTS & unit tests

Change-Id: Id1cc8c08042011156cec9d3c4a9784fd6f90ddf5
parent 19850263

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

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static com.android.server.wm.utils.RegionUtils.forEachRect; 
import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.annotation.NonNull;

import android.app.Service;

import android.content.Context;

import android.graphics.Canvas;

import android.graphics.Color;
@@ -127,7 +126,7 @@ final class AccessibilityController { 
    public boolean setWindowsForAccessibilityCallbackLocked(int displayId,

            WindowsForAccessibilityCallback callback) {

        if (callback != null) {

            final DisplayContent dc = mService.mRoot.getDisplayContent(displayId);

            final DisplayContent dc = mService.mRoot.getDisplayContentOrCreate(displayId);

            if (dc == null) {

                return false;

            }