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

Commit cd007b59 authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Check real virtual display id for input devices" into sc-dev

parents a54b7154 1505d893

services/core/java/com/android/server/wm/DisplayContent.java

+1 −3
Original line number Diff line number Diff line
@@ -2108,9 +2108,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            }



            // Check if input device can dispatch events to current display.

            // If display type is virtual, will follow the default display.

            if (!mWmService.mInputManager.canDispatchToDisplay(device.getId(),

                    displayInfo.type == Display.TYPE_VIRTUAL ? DEFAULT_DISPLAY : mDisplayId)) {

            if (!mWmService.mInputManager.canDispatchToDisplay(device.getId(), mDisplayId)) {

                continue;

            }

services/core/java/com/android/server/wm/InputManagerCallback.java

+1 −3
Original line number Diff line number Diff line
@@ -116,10 +116,8 @@ final class InputManagerCallback implements InputManagerService.WindowManagerCal 
    /** Notifies that the input device configuration has changed. */

    @Override

    public void notifyConfigurationChanged() {

        // TODO(multi-display): Notify proper displays that are associated with this input device.



        synchronized (mService.mGlobalLock) {

            mService.getDefaultDisplayContentLocked().sendNewConfiguration();

            mService.mRoot.forAllDisplays(DisplayContent::sendNewConfiguration);

        }



        synchronized (mInputDevicesReadyMonitor) {