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

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

Snap for 6099757 from 6f6e2305 to rvc-release 

Change-Id: I7b5c49a256846dd7de4d09ed129e7823bc340ac2
parents edee2a8a 6f6e2305

cmds/surfacereplayer/proto/src/trace.proto

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ message SurfaceChange { 
        RelativeParentChange        relative_parent         = 18;

        DetachChildrenChange        detach_children         = 19;

        ReparentChildrenChange      reparent_children       = 20;

        ShadowRadiusChange          shadow_radius           = 22;

    }

}
@@ -199,3 +200,7 @@ message RelativeParentChange { 
message DetachChildrenChange {

    required bool detach_children = 1;

}



message ShadowRadiusChange {

    required float radius = 1;

}
 
 No newline at end of file

cmds/surfacereplayer/replayer/Replayer.cpp

+8 −0
Original line number Diff line number Diff line
@@ -424,6 +424,9 @@ status_t Replayer::doSurfaceTransaction( 
            case SurfaceChange::SurfaceChangeCase::kDetachChildren:

                setDetachChildrenChange(transaction, change.id(), change.detach_children());

                break;

            case SurfaceChange::SurfaceChangeCase::kShadowRadius:

                setShadowRadiusChange(transaction, change.id(), change.shadow_radius());

                break;

            default:

                status = 1;

                break;
@@ -724,3 +727,8 @@ void Replayer::setReparentChildrenChange(SurfaceComposerClient::Transaction& t, 
    }

    t.reparentChildren(mLayers[id], mLayers[c.parent_id()]->getHandle());

}



void Replayer::setShadowRadiusChange(SurfaceComposerClient::Transaction& t,

        layer_id id, const ShadowRadiusChange& c) {

    t.setShadowRadius(mLayers[id], c.radius());

}

cmds/surfacereplayer/replayer/Replayer.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ class Replayer { 
            layer_id id, const DetachChildrenChange& c);

    void setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const ReparentChildrenChange& c);

    void setShadowRadiusChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const ShadowRadiusChange& c);



    void setDisplaySurface(SurfaceComposerClient::Transaction& t,

            display_id id, const DispSurfaceChange& dsc);

include/input/InputWindow.h

+6 −0
Original line number Diff line number Diff line
@@ -119,7 +119,11 @@ struct InputWindowInfo { 
    /* These values are filled in by the WM and passed through SurfaceFlinger

     * unless specified otherwise.

     */

    // This value should NOT be used to uniquely identify the window. There may be different

    // input windows that have the same token.

    sp<IBinder> token;

    // This uniquely identifies the input window.

    int32_t id = 0;

    std::string name;

    int32_t layoutParamsFlags;

    int32_t layoutParamsType;
@@ -203,6 +207,8 @@ public: 


    sp<IBinder> getToken() const;



    int32_t getId() const { return mInfo.id; }



    sp<IBinder> getApplicationToken() {

        return mInfo.applicationInfo.token;

    }

libs/input/InputWindow.cpp

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ status_t InputWindowInfo::write(Parcel& output) const { 
    status_t s = output.writeStrongBinder(token);

    if (s != OK) return s;



    output.writeInt32(id);

    output.writeString8(String8(name.c_str()));

    output.writeInt32(layoutParamsFlags);

    output.writeInt32(layoutParamsType);
@@ -116,6 +117,7 @@ InputWindowInfo InputWindowInfo::read(const Parcel& from) { 
    }



    ret.token = token;

    ret.id = from.readInt32();

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

    ret.layoutParamsFlags = from.readInt32();

    ret.layoutParamsType = from.readInt32();