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

Commit ffb0795d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 9df7f313: am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error" 

* commit '9df7f31359866a77a47c9fab3171c71715fd0056':
  frameworks/base: Destroy the overlay even if there is an error
parents fe67926e ec756056

libs/ui/Overlay.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ void* Overlay::getBufferAddress(overlay_buffer_t buffer) 
}

}





void Overlay::destroy() {  

void Overlay::destroy() {  

    if (mStatus != NO_ERROR) return;





    // Must delete the objects in reverse creation order, thus the

    // Must delete the objects in reverse creation order, thus the

    //  data side must be closed first and then the destroy send to

    //  data side must be closed first and then the destroy send to
@@ -104,9 +103,15 @@ void Overlay::destroy() { 
    if (mOverlayData) {

    if (mOverlayData) {

        overlay_data_close(mOverlayData);

        overlay_data_close(mOverlayData);

        mOverlayData = NULL;

        mOverlayData = NULL;

    } else {

        LOGD("Overlay::destroy mOverlayData is NULL");

    }

    }





    if (mOverlayRef != 0) {

        mOverlayRef->mOverlayChannel->destroy();

        mOverlayRef->mOverlayChannel->destroy();

    } else {

        LOGD("Overlay::destroy mOverlayRef is NULL");

    }

}

}





status_t Overlay::getStatus() const {

status_t Overlay::getStatus() const {