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

Commit 85e76662 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "Duplicated fileDesc is not closed when input file is not forward-lock... 

Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053."
parents 8068cb8e cbe0d94a

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp

+4 −1
Original line number Diff line number Diff line
@@ -455,11 +455,14 @@ status_t FwdLockEngine::onOpenDecryptSession(int uniqueId, 
        } else {

            LOGD("FwdLockEngine::onOpenDecryptSession Integrity Check failed for the fd");

            FwdLockFile_detach(fileDesc);

            ::close(fileDesc);

            delete decodeSession;

        }

    }



    if (DRM_NO_ERROR != result && -1 < fileDesc) {

        ::close(fileDesc);

    }



    LOGD("FwdLockEngine::onOpenDecryptSession Exit. result = %d", result);



    return result;