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

Commit 4eccaf5e authored by RyanlwLin's avatar RyanlwLin
Browse files

Do not redispatch/inject motionevent to private virtual display 

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
parent 2d1d4889

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+16 −4
Original line number Diff line number Diff line
@@ -2535,18 +2535,17 @@ 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);

                    }

                }

            }

        }



        @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} */