Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ameer Armaly
2023-05-05 22:01:50 +00:00
committed by Android (Google) Code Review
parent f0fe79de5e 139936a029
commit 38c3b84ec9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java
View File

@@ -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(

7
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -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();
}
}