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

Commit 39c0d06b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "sf: avoid assumption remote binder is local" into rvc-dev am: 51e304e1 am: 4809fecb 

Change-Id: Ibdcf4868b2442ab74e0bc61f0ebd85b644724e7b
parents e4024d8e 4809fecb

services/surfaceflinger/RegionSamplingThread.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -201,9 +201,10 @@ RegionSamplingThread::~RegionSamplingThread() { 




void RegionSamplingThread::addListener(const Rect& samplingArea, const sp<IBinder>& stopLayerHandle,

void RegionSamplingThread::addListener(const Rect& samplingArea, const sp<IBinder>& stopLayerHandle,

                                       const sp<IRegionSamplingListener>& listener) {

                                       const sp<IRegionSamplingListener>& listener) {

    wp<Layer> stopLayer = stopLayerHandle != nullptr

    wp<Layer> stopLayer;

            ? static_cast<Layer::Handle*>(stopLayerHandle.get())->owner

    if (stopLayerHandle != nullptr && stopLayerHandle->localBinder() != nullptr) {

            : nullptr;

        stopLayer = static_cast<Layer::Handle*>(stopLayerHandle.get())->owner;

    }





    sp<IBinder> asBinder = IInterface::asBinder(listener);

    sp<IBinder> asBinder = IInterface::asBinder(listener);

    asBinder->linkToDeath(this);

    asBinder->linkToDeath(this);