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

Merge "Don't notify display removed if it's a private virtual display"

Browse Source
This commit is contained in:
Ryan Lin
2020-02-19 09:42:56 +00:00
committed by Android (Google) Code Review
parent 16c028fe54 6a34da5a64
commit 687fb4bcc1
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2879,11 +2879,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
@Override
public void onDisplayRemoved(int displayId) {
synchronized (mLock) {
for (int i = 0; i < mDisplaysList.size(); i++) {
if (mDisplaysList.get(i).getDisplayId() == displayId) {
mDisplaysList.remove(i);
break;
}
if (!removeDisplayFromList(displayId)) {
return;
}
if (mInputFilter != null) {
mInputFilter.onDisplayChanged();
@@ -2903,6 +2900,17 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
mA11yWindowManager.stopTrackingWindows(displayId);
}
@GuardedBy("mLock")
private boolean removeDisplayFromList(int displayId) {
for (int i = 0; i < mDisplaysList.size(); i++) {
if (mDisplaysList.get(i).getDisplayId() == displayId) {
mDisplaysList.remove(i);
return true;
}
}
return false;
}
@Override
public void onDisplayChanged(int displayId) {
/* do nothing */
@@ -2914,8 +2922,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
// Private virtual displays are created by the ap and is not allowed to access by other
// aps. We assume we could ignore them.
if ((display.getType() == Display.TYPE_VIRTUAL
&& (display.getFlags() & Display.FLAG_PRIVATE) != 0)) {
if (display.getType() == Display.TYPE_VIRTUAL
&& (display.getFlags() & Display.FLAG_PRIVATE) != 0) {
return false;
}
return true;