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

Commit 03a694fa authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6402531 from 2984b7af to rvc-release 

Change-Id: I9f13dfe0bbe49bc8468b3d365a5f397f5b3257b0
parents 735ce572 2984b7af

headers/media_plugin/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexParamVideoVp9,                         /**< reference: OMX_VIDEO_PARAM_VP9TYPE */

    OMX_IndexParamVideoAndroidVp9Encoder,           /**< reference: OMX_VIDEO_PARAM_ANDROID_VP9ENCODERTYPE */

    OMX_IndexParamVideoAndroidImageGrid,            /**< reference: OMX_VIDEO_PARAM_ANDROID_IMAGEGRIDTYPE */

    OMX_IndexParamVideoAndroidRequiresSwRenderer,   /**< reference: OMX_PARAM_U32TYPE */

    OMX_IndexExtVideoEndUnused,



    /* Image & Video common configurations */

include/input/InputWindow.h

+20 −20
Original line number Diff line number Diff line
@@ -123,17 +123,17 @@ struct InputWindowInfo { 
    // input windows that have the same token.

    sp<IBinder> token;

    // This uniquely identifies the input window.

    int32_t id = 0;

    int32_t id = -1;

    std::string name;

    int32_t layoutParamsFlags;

    int32_t layoutParamsType;

    nsecs_t dispatchingTimeout;

    int32_t layoutParamsFlags = 0;

    int32_t layoutParamsType = 0;

    nsecs_t dispatchingTimeout = -1;



    /* These values are filled in by SurfaceFlinger. */

    int32_t frameLeft;

    int32_t frameTop;

    int32_t frameRight;

    int32_t frameBottom;

    int32_t frameLeft = -1;

    int32_t frameTop = -1;

    int32_t frameRight = -1;

    int32_t frameBottom = -1;



    /*

     * SurfaceFlinger consumes this value to shrink the computed frame. This is
@@ -145,7 +145,7 @@ struct InputWindowInfo { 


    // A global scaling factor for all windows. Unlike windowScaleX/Y this results

    // in scaling of the TOUCH_MAJOR/TOUCH_MINOR axis.

    float globalScaleFactor;

    float globalScaleFactor = 1.0f;



    // Scaling factors applied to individual windows.

    float windowXScale = 1.0f;
@@ -156,18 +156,18 @@ struct InputWindowInfo { 
     * to absolute coordinates by SurfaceFlinger once the frame is computed.

     */

    Region touchableRegion;

    bool visible;

    bool canReceiveKeys;

    bool hasFocus;

    bool hasWallpaper;

    bool paused;

    int32_t ownerPid;

    int32_t ownerUid;

    int32_t inputFeatures;

    int32_t displayId;

    bool visible = false;

    bool canReceiveKeys = false;

    bool hasFocus = false;

    bool hasWallpaper = false;

    bool paused = false;

    int32_t ownerPid = -1;

    int32_t ownerUid = -1;

    int32_t inputFeatures = 0;

    int32_t displayId = ADISPLAY_ID_NONE;

    int32_t portalToDisplayId = ADISPLAY_ID_NONE;

    InputApplicationInfo applicationInfo;

    bool replaceTouchableRegionWithCrop;

    bool replaceTouchableRegionWithCrop = false;

    wp<IBinder> touchableRegionCropHandle;



    void addTouchableRegion(const Rect& region);
@@ -213,7 +213,7 @@ public: 
    }



    inline std::string getName() const {

        return mInfo.token ? mInfo.name : "<invalid>";

        return !mInfo.name.empty() ? mInfo.name : "<invalid>";

    }



    inline nsecs_t getDispatchingTimeout(nsecs_t defaultValue) const {

libs/input/InputWindow.cpp

+2 −7
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ bool InputWindowInfo::overlaps(const InputWindowInfo* other) const { 
}



status_t InputWindowInfo::write(Parcel& output) const {

    if (token == nullptr) {

    if (name.empty()) {

        output.writeInt32(0);

        return OK;

    }
@@ -110,12 +110,7 @@ InputWindowInfo InputWindowInfo::read(const Parcel& from) { 
        return ret;

    }



    sp<IBinder> token = from.readStrongBinder();

    if (token == nullptr) {

        return ret;

    }



    ret.token = token;

    ret.token = from.readStrongBinder();

    ret.id = from.readInt32();

    ret.name = from.readString8().c_str();

    ret.layoutParamsFlags = from.readInt32();

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3598,9 +3598,9 @@ void InputDispatcher::updateWindowHandlesForDisplayLocked( 
            if (canReceiveInput && !noInputChannel) {

                ALOGV("Window handle %s has no registered input channel",

                      handle->getName().c_str());

            }

                continue;

            }

        }



        if (info->displayId != displayId) {

            ALOGE("Window %s updated by wrong display %d, should belong to display %d",

services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFECompositionState.h

+5 −3
Original line number Diff line number Diff line
@@ -33,13 +33,15 @@ 
#include <ui/GraphicBuffer.h>

#include <ui/GraphicTypes.h>



#include "DisplayHardware/ComposerHal.h"

#include "DisplayHardware/Hal.h"



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"



namespace android::compositionengine {



namespace hal = android::hardware::graphics::composer::hal;



// More complex metadata for this layer

struct GenericLayerMetadataEntry {

    // True if the metadata may affect the composed result.
@@ -108,7 +110,7 @@ struct LayerFECompositionState { 
    Region transparentRegionHint;



    // The blend mode for this layer

    Hwc2::IComposerClient::BlendMode blendMode{Hwc2::IComposerClient::BlendMode::INVALID};

    hal::BlendMode blendMode{hal::BlendMode::INVALID};



    // The bounds of the layer in layer local coordinates

    FloatRect geomLayerBounds;
@@ -145,7 +147,7 @@ struct LayerFECompositionState { 
     */



    // The type of composition for this layer

    Hwc2::IComposerClient::Composition compositionType{Hwc2::IComposerClient::Composition::INVALID};

    hal::Composition compositionType{hal::Composition::INVALID};



    // The buffer and related state

    sp<GraphicBuffer> buffer;