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

Commit 970f2df3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent displays that are disabled from receiving input" into tm-qpr-dev am: 3ca7a5ab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19299674



Change-Id: Ib64c47c955f4f44beb538f62a8a8669a84257041
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e38cd4da 3ca7a5ab

services/core/java/com/android/server/display/LogicalDisplay.java

+4 −2
Original line number Diff line number Diff line
@@ -522,10 +522,12 @@ final class LogicalDisplay { 
        // Set the layer stack.

        device.setLayerStackLocked(t, isBlanked ? BLANK_LAYER_STACK : mLayerStack);

        // Also inform whether the device is the same one sent to inputflinger for its layerstack.

        // Prevent displays that are disabled from receiving input.

        // TODO(b/188914255): Remove once input can dispatch against device vs layerstack.

        device.setDisplayFlagsLocked(t,

                device.getDisplayDeviceInfoLocked().touch != TOUCH_NONE

                        ? SurfaceControl.DISPLAY_RECEIVES_INPUT : 0);

                (isEnabled() && device.getDisplayDeviceInfoLocked().touch != TOUCH_NONE)

                        ? SurfaceControl.DISPLAY_RECEIVES_INPUT

                        : 0);



        // Set the color mode and allowed display mode.

        if (device == mPrimaryDisplayDevice) {

services/tests/servicestests/src/com/android/server/display/LogicalDisplayTest.java

+41 −5
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ 
package com.android.server.display;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.PropertyInvalidatedCache;
@@ -45,18 +49,21 @@ public class LogicalDisplayTest { 


    private LogicalDisplay mLogicalDisplay;

    private DisplayDevice mDisplayDevice;

    private final DisplayDeviceInfo mDisplayDeviceInfo = new DisplayDeviceInfo();



    @Before

    public void setUp() {

        // Share classloader to allow package private access.

        System.setProperty("dexmaker.share_classloader", "true");

        mDisplayDevice = mock(DisplayDevice.class);

        DisplayDeviceInfo displayDeviceInfo = new DisplayDeviceInfo();

        displayDeviceInfo.width = DISPLAY_WIDTH;

        displayDeviceInfo.height = DISPLAY_HEIGHT;

        displayDeviceInfo.flags = DisplayDeviceInfo.FLAG_ROTATES_WITH_CONTENT;

        mLogicalDisplay = new LogicalDisplay(DISPLAY_ID, LAYER_STACK, mDisplayDevice);

        when(mDisplayDevice.getDisplayDeviceInfoLocked()).thenReturn(displayDeviceInfo);



        mDisplayDeviceInfo.copyFrom(new DisplayDeviceInfo());

        mDisplayDeviceInfo.width = DISPLAY_WIDTH;

        mDisplayDeviceInfo.height = DISPLAY_HEIGHT;

        mDisplayDeviceInfo.flags = DisplayDeviceInfo.FLAG_ROTATES_WITH_CONTENT;

        mDisplayDeviceInfo.touch = DisplayDeviceInfo.TOUCH_INTERNAL;

        when(mDisplayDevice.getDisplayDeviceInfoLocked()).thenReturn(mDisplayDeviceInfo);



        // Disable binder caches in this process.

        PropertyInvalidatedCache.disableForTestMode();
@@ -103,4 +110,33 @@ public class LogicalDisplayTest { 
        mLogicalDisplay.configureDisplayLocked(t, mDisplayDevice, false);

        assertEquals(expectedPosition, mLogicalDisplay.getDisplayPosition());

    }



    @Test

    public void testDisplayInputFlags() {

        SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class);

        mLogicalDisplay.configureDisplayLocked(t, mDisplayDevice, false);

        verify(t).setDisplayFlags(any(), eq(SurfaceControl.DISPLAY_RECEIVES_INPUT));

        reset(t);



        mDisplayDeviceInfo.touch = DisplayDeviceInfo.TOUCH_NONE;

        mLogicalDisplay.configureDisplayLocked(t, mDisplayDevice, false);

        verify(t).setDisplayFlags(any(), eq(0));

        reset(t);



        mDisplayDeviceInfo.touch = DisplayDeviceInfo.TOUCH_VIRTUAL;

        mLogicalDisplay.configureDisplayLocked(t, mDisplayDevice, false);

        verify(t).setDisplayFlags(any(), eq(SurfaceControl.DISPLAY_RECEIVES_INPUT));

        reset(t);



        mLogicalDisplay.setPhase(LogicalDisplay.DISPLAY_PHASE_DISABLED);

        mLogicalDisplay.configureDisplayLocked(t, mDisplayDevice, false);

        verify(t).setDisplayFlags(any(), eq(0));

        reset(t);



        mLogicalDisplay.setPhase(LogicalDisplay.DISPLAY_PHASE_ENABLED);

        mDisplayDeviceInfo.touch = DisplayDeviceInfo.TOUCH_EXTERNAL;

        mLogicalDisplay.configureDisplayLocked(t, mDisplayDevice, false);

        verify(t).setDisplayFlags(any(), eq(SurfaceControl.DISPLAY_RECEIVES_INPUT));

        reset(t);

    }

}