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

Commit 00270c11 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7655020 from 214040a7 to sc-v2-release 

Change-Id: Iaebedbec8d5988568a587673e1b3d5fbecf04bb8
parents 4cb718cc 214040a7

libs/gui/WindowInfo.cpp

+4 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ bool WindowInfo::operator==(const WindowInfo& info) const { 
            info.frameLeft == frameLeft && info.frameTop == frameTop &&

            info.frameRight == frameRight && info.frameBottom == frameBottom &&

            info.surfaceInset == surfaceInset && info.globalScaleFactor == globalScaleFactor &&

            info.transform == transform && info.displayWidth == displayWidth &&

            info.displayHeight == displayHeight &&

            info.transform == transform && info.displayOrientation == displayOrientation &&

            info.displayWidth == displayWidth && info.displayHeight == displayHeight &&

            info.touchableRegion.hasSameRects(touchableRegion) && info.visible == visible &&

            info.trustedOverlay == trustedOverlay && info.focusable == focusable &&

            info.touchOcclusionMode == touchOcclusionMode && info.hasWallpaper == hasWallpaper &&
@@ -97,6 +97,7 @@ status_t WindowInfo::writeToParcel(android::Parcel* parcel) const { 
        parcel->writeFloat(transform.dtdy()) ?:

        parcel->writeFloat(transform.dsdy()) ?:

        parcel->writeFloat(transform.ty()) ?:

        parcel->writeUint32(displayOrientation) ?:

        parcel->writeInt32(displayWidth) ?:

        parcel->writeInt32(displayHeight) ?:

        parcel->writeBool(visible) ?:
@@ -154,6 +155,7 @@ status_t WindowInfo::readFromParcel(const android::Parcel* parcel) { 
        parcel->readFloat(&dtdy) ?:

        parcel->readFloat(&dsdy) ?:

        parcel->readFloat(&ty) ?:

        parcel->readUint32(&displayOrientation) ?:

        parcel->readInt32(&displayWidth) ?:

        parcel->readInt32(&displayHeight) ?:

        parcel->readBool(&visible) ?:

libs/gui/include/gui/WindowInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ struct WindowInfo : public Parcelable { 
    // Transform applied to individual windows.

    ui::Transform transform;



    // Display orientation. Used for compatibility raw coordinates.

    // Display orientation as ui::Transform::RotationFlags. Used for compatibility raw coordinates.

    uint32_t displayOrientation = ui::Transform::ROT_0;



    // Display size in its natural rotation. Used to rotate raw coordinates for compatibility.

services/inputflinger/dispatcher/InputDispatcher.cpp

+3 −2
Original line number Diff line number Diff line
@@ -5049,12 +5049,13 @@ void InputDispatcher::dumpDispatchStateLocked(std::string& dump) { 
                                         windowInfo->inputFeatures.string().c_str());

                    dump += StringPrintf(", ownerPid=%d, ownerUid=%d, dispatchingTimeout=%" PRId64

                                         "ms, trustedOverlay=%s, hasToken=%s, "

                                         "touchOcclusionMode=%s\n",

                                         "touchOcclusionMode=%s, displayOrientation=%d\n",

                                         windowInfo->ownerPid, windowInfo->ownerUid,

                                         millis(windowInfo->dispatchingTimeout),

                                         toString(windowInfo->trustedOverlay),

                                         toString(windowInfo->token != nullptr),

                                         toString(windowInfo->touchOcclusionMode).c_str());

                                         toString(windowInfo->touchOcclusionMode).c_str(),

                                         windowInfo->displayOrientation);

                    windowInfo->transform.dump(dump, "transform", INDENT4);

                }

            } else {