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

Unverified Commit b85f21e9 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-9.0.0_r61' into staging/lineage-16.0_merge-android-9.0.0_r61 

Android 9.0.0 Release 61 (6780336)

* tag 'android-9.0.0_r61':
  Fixing small bug for sec release
parents 6f1c8350 76923a32

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3842,7 +3842,7 @@ status_t SurfaceFlinger::onLayerRemoved(const sp<Client>& client, const sp<IBind 
    // called by a client when it wants to remove a Layer

    status_t err = NO_ERROR;

    sp<Layer> l = fromHandle(handle);

    if (l != nullptr || client->isAttached(handle)) {

    if (l != nullptr && client->isAttached(handle)) {

        mInterceptor->saveSurfaceDeletion(l);

        err = removeLayerLocked(mStateLock, l);

        ALOGE_IF(err<0 && err != NAME_NOT_FOUND,