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

Commit 1505d893 authored by Christine Franks's avatar Christine Franks
Browse files

Check real virtual display id for input devices 

And update all display's configurations

Bug: 184615313
Test: manual
Change-Id: I3cebf22bebf650e31b554a412725de644c850e80
parent 32a48b01

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

+1 −3
Original line number Diff line number Diff line
@@ -2105,9 +2105,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) {