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

Commit 38c3b84e authored by Ameer Armaly's avatar Ameer Armaly Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Make a11y overlays trusted." into udc-dev

parents f0fe79de 139936a0

services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

+3 −0
Original line number Diff line number Diff line
@@ -2551,6 +2551,9 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 
    @Override

    public void attachAccessibilityOverlayToWindow(int accessibilityWindowId, SurfaceControl sc)

            throws RemoteException {

        SurfaceControl.Transaction t = new SurfaceControl.Transaction();

        t.setTrustedOverlay(sc, true).apply();

        t.close();

        synchronized (mLock) {

            RemoteAccessibilityConnection connection =

                    mA11yWindowManager.getConnectionLocked(

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+3 −4
Original line number Diff line number Diff line
@@ -5329,9 +5329,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            mA11yOverlayLayers.remove(displayId);

            return;

        }

        SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();

        transaction.reparent(sc, parent);

        transaction.apply();

        transaction.close();

        SurfaceControl.Transaction t = new SurfaceControl.Transaction();

        t.reparent(sc, parent).setTrustedOverlay(sc, true).apply();

        t.close();

    }

}