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

Commit c19792bb authored by Ameer Armaly's avatar Ameer Armaly Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Make a11y overlays trusted. am: 139936a0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22827660



Change-Id: I69ccdcf31213c7fab74989f13082001ffa4da290
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b8cee80 139936a0

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

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

    @Override

    public void attachAccessibilityOverlayToWindow(int accessibilityWindowId, SurfaceControl sc)

    public void attachAccessibilityOverlayToWindow(int accessibilityWindowId, SurfaceControl sc)

            throws RemoteException {

            throws RemoteException {

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

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

        t.close();

        synchronized (mLock) {

        synchronized (mLock) {

            RemoteAccessibilityConnection connection =

            RemoteAccessibilityConnection connection =

                    mA11yWindowManager.getConnectionLocked(

                    mA11yWindowManager.getConnectionLocked(

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

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

            mA11yOverlayLayers.remove(displayId);

            return;

            return;

        }

        }

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

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

        transaction.reparent(sc, parent);

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

        transaction.apply();

        t.close();

        transaction.close();

    }

    }

}
 
}