summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-06 22:25:59 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-06 22:25:59 -0800
commit5a02366bbebeac428d0fa9c056445fec0c48816e (patch)
tree64b720618b536168976cc6e0aaadd75ed3229fe2 /services
parenta6cc743a2f2ffa174b2a1314c413cf2fab0f0f77 (diff)
parent3d5d633e829eaf0b7cb1bb76f599ca7e250d0bab (diff)
Merge "Make overlay display valid in accessibility" into main
Diffstat (limited to 'services')
-rw-r--r--services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java2
-rw-r--r--services/core/java/com/android/server/wm/AccessibilityController.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 573c591cb504..6c26c1f74002 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -5610,7 +5610,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
private boolean isValidDisplay(@Nullable Display display) {
- if (display == null || display.getType() == Display.TYPE_OVERLAY) {
+ if (display == null) {
return false;
}
// Private virtual displays are created by the ap and is not allowed to access by other
diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java
index 1299a4d86623..f243d4fa825a 100644
--- a/services/core/java/com/android/server/wm/AccessibilityController.java
+++ b/services/core/java/com/android/server/wm/AccessibilityController.java
@@ -153,7 +153,7 @@ final class AccessibilityController {
final DisplayContent dc = mService.mRoot.getDisplayContent(displayId);
if (dc != null) {
final Display display = dc.getDisplay();
- if (display != null && display.getType() != Display.TYPE_OVERLAY) {
+ if (display != null) {
final DisplayMagnifier magnifier = new DisplayMagnifier(
mService, dc, display, callbacks);
magnifier.notifyImeWindowVisibilityChanged(