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

Commit 124d75e8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant local parameters in Client" into main am: 3f3d21c5 am: 771272fc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3446790



Change-Id: If515523707b5dd72122654cd0cd928408391919c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dfab5194 771272fc

services/surfaceflinger/Client.cpp

+0 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ binder::Status Client::createSurface(const std::string& name, int32_t flags, 
                                     const sp<IBinder>& parent, const gui::LayerMetadata& metadata,

                                     gui::CreateSurfaceResult* outResult) {

    // We rely on createLayer to check permissions.

    sp<IBinder> handle;

    LayerCreationArgs args(mFlinger.get(), sp<Client>::fromExisting(this), name.c_str(),

                           static_cast<uint32_t>(flags), std::move(metadata));

    args.parentHandle = parent;
@@ -101,7 +100,6 @@ binder::Status Client::getLayerFrameStats(const sp<IBinder>& handle, gui::FrameS 


binder::Status Client::mirrorSurface(const sp<IBinder>& mirrorFromHandle,

                                     gui::CreateSurfaceResult* outResult) {

    sp<IBinder> handle;

    LayerCreationArgs args(mFlinger.get(), sp<Client>::fromExisting(this), "MirrorRoot",

                           0 /* flags */, gui::LayerMetadata());

    status_t status = mFlinger->mirrorLayer(args, mirrorFromHandle, *outResult);
@@ -109,7 +107,6 @@ binder::Status Client::mirrorSurface(const sp<IBinder>& mirrorFromHandle, 
}



binder::Status Client::mirrorDisplay(int64_t displayId, gui::CreateSurfaceResult* outResult) {

    sp<IBinder> handle;

    LayerCreationArgs args(mFlinger.get(), sp<Client>::fromExisting(this),

                           "MirrorRoot-" + std::to_string(displayId), 0 /* flags */,

                           gui::LayerMetadata());