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

Commit 47760471 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix display size update check." into main

parents 2a9f96f4 36544576

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

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ abstract class DisplayDevice { 
     * Sets display size while in a transaction.

     */

    public final void setDisplaySizeLocked(SurfaceControl.Transaction t, int width, int height) {

        if (width != mLastDisplayWidth && height != mLastDisplayHeight) {

        if (width != mLastDisplayWidth || height != mLastDisplayHeight) {

            mLastDisplayWidth = width;

            mLastDisplayHeight = height;

            t.setDisplaySize(mDisplayToken, width, height);

services/tests/displayservicetests/src/com/android/server/display/DisplayDeviceTest.java

+8 −8
Original line number Diff line number Diff line
@@ -167,18 +167,18 @@ public class DisplayDeviceTest { 
        DisplayDevice displayDevice = new FakeDisplayDevice(mDisplayDeviceInfo,

                mMockDisplayAdapter);

        mDisplayDeviceInfo.installOrientation = Surface.ROTATION_0;

        mDisplayDeviceInfo.width = 100;

        mDisplayDeviceInfo.width = WIDTH;

        mDisplayDeviceInfo.height = 200;

        displayDevice.configureDisplaySizeLocked(mMockTransaction);

        verify(mMockTransaction).setDisplaySize(isNull(), eq(100), eq(200));

        verify(mMockTransaction).setDisplaySize(isNull(), eq(WIDTH), eq(200));



        Mockito.clearInvocations(mMockTransaction);



        mDisplayDeviceInfo.installOrientation = Surface.ROTATION_180;

        mDisplayDeviceInfo.width = 300;

        mDisplayDeviceInfo.height = 400;

        mDisplayDeviceInfo.height = 200;

        displayDevice.configureDisplaySizeLocked(mMockTransaction);

        verify(mMockTransaction).setDisplaySize(isNull(), eq(300), eq(400));

        verify(mMockTransaction).setDisplaySize(isNull(), eq(300), eq(200));

    }



    @Test
@@ -186,18 +186,18 @@ public class DisplayDeviceTest { 
        DisplayDevice displayDevice = new FakeDisplayDevice(mDisplayDeviceInfo,

                mMockDisplayAdapter);

        mDisplayDeviceInfo.installOrientation = Surface.ROTATION_90;

        mDisplayDeviceInfo.width = 100;

        mDisplayDeviceInfo.width = WIDTH;

        mDisplayDeviceInfo.height = 200;

        displayDevice.configureDisplaySizeLocked(mMockTransaction);

        verify(mMockTransaction).setDisplaySize(isNull(), eq(200), eq(100));

        verify(mMockTransaction).setDisplaySize(isNull(), eq(200), eq(WIDTH));



        Mockito.clearInvocations(mMockTransaction);



        mDisplayDeviceInfo.installOrientation = Surface.ROTATION_270;

        mDisplayDeviceInfo.width = 300;

        mDisplayDeviceInfo.height = 400;

        mDisplayDeviceInfo.height = 200;

        displayDevice.configureDisplaySizeLocked(mMockTransaction);

        verify(mMockTransaction).setDisplaySize(isNull(), eq(400), eq(300));

        verify(mMockTransaction).setDisplaySize(isNull(), eq(200), eq(300));

    }



    @Test