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

Do not redispatch/inject motionevent to private virtual display

Browse Source 
The virtaul display with private flag can't be access by other process.
To prevent AceesibilityService redispatches/injects motionevents on it,
We don't add it to valid displayList.

Bug: 138637403
Test: AccessibilityInputFilterTest
Test: AccessibilityGestureDectorTest
Change-Id: I7b60e4eee87b0812d3c882d0e45bbf2016190e6a
This commit is contained in:
RyanlwLin
2019-08-07 16:18:18 +08:00
parent 2d1d48895d
commit 4eccaf5e39
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
View File

@@ -29,8 +29,8 @@ import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.accessibility.AccessibilityEvent;
import com.android.server.accessibility.gestures.TouchExplorer;
import com.android.server.LocalServices;
import com.android.server.accessibility.gestures.TouchExplorer;
import com.android.server.policy.WindowManagerPolicy;
import java.util.ArrayList;

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

@@ -2535,10 +2535,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
// to create event handler per display. The events should be handled by the
// display which is overlaid by it.
final Display display = displays[i];
if (display.getType() == Display.TYPE_OVERLAY) {
continue;
if (isValidDisplay(display)) {
mDisplaysList.add(display);
}
mDisplaysList.add(display);
}
}
}
@@ -2546,7 +2545,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
@Override
public void onDisplayAdded(int displayId) {
final Display display = mDisplayManager.getDisplay(displayId);
if (display == null || display.getType() == Display.TYPE_OVERLAY) {
if (!isValidDisplay(display)) {
return;
}
@@ -2597,6 +2596,19 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
public void onDisplayChanged(int displayId) {
/* do nothing */
}
private boolean isValidDisplay(@Nullable Display display) {
if (display == null || display.getType() == Display.TYPE_OVERLAY) {
return false;
}
// 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)) {
return false;
}
return true;
}
}
/** Represents an {@link AccessibilityManager} */