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

Commit 4e8fa27b authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "frameworks/base: Destroy the overlay even if there is an error"

parents 6772c2d9 29a73ba8

libs/ui/Overlay.cpp

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



void Overlay::destroy() {  

    if (mStatus != NO_ERROR) return;



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

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

        overlay_data_close(mOverlayData);

        mOverlayData = NULL;

    } else {

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

    }



    if (mOverlayRef != 0) {

        mOverlayRef->mOverlayChannel->destroy();

    } else {

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

    }

}



status_t Overlay::getStatus() const {