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

Commit 5546b7b0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5452883 from ea17f777 to qt-release 

Change-Id: I0a4fb0c2b50ea0ee2e631847d07c7ccf5d978959
parents 0bfaed36 ea17f777

libs/dumputils/dump_utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static const char* hal_interfaces_to_dump[] { 
        "android.hardware.health@2.0::IHealth",

        "android.hardware.media.omx@1.0::IOmx",

        "android.hardware.media.omx@1.0::IOmxStore",

        "android.hardware.power.stats@1.0::IPowerStats",

        "android.hardware.sensors@1.0::ISensors",

        "android.hardware.vr@1.0::IVr",

        NULL,

services/surfaceflinger/Layer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1810,7 +1810,8 @@ Layer::RoundedCornerState Layer::getRoundedCornerState() const { 
        }

    }

    const float radius = getDrawingState().cornerRadius;

    return radius > 0 ? RoundedCornerState(getCrop(getDrawingState()).toFloatRect(), radius)

    return radius > 0 && getCrop(getDrawingState()).isValid()

            ? RoundedCornerState(getCrop(getDrawingState()).toFloatRect(), radius)

            : RoundedCornerState();

}

services/surfaceflinger/OWNERS

+2 −0
Original line number Diff line number Diff line 
adyabr@google.com

akrulec@google.com

alecmouri@google.com

chaviw@google.com

lpy@google.com

marissaw@google.com