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

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

@@ -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;