Reapply "Reintroduced the condition check before calling clear() in clearDrmSession(), which was missed during the DRM refactoring (#619)"

This reverts commit ab0a646.

Author: psiva01

drm/AampDRMLicManager.cpp

@@ -1521,9 +1521,17 @@ void AampDRMLicenseManager::clearDrmSession(bool forceClearSession)
 {
 	mDrmSessionManager->clearDrmSession(forceClearSession);
 	for(int i = 0 ; i < mMaxDRMSessions;i++)
-    {
-        mLicenseDownloader[i].Clear();
-    }
+	{
+		bool isFailedKeyId = mDrmSessionManager->getFailedKeyIdStatus(i);
+		if(( mDrmSessionManager->drmSessionContexts != NULL && (isFailedKeyId || forceClearSession)  ))
+		{
+			if(mDrmSessionManager->drmSessionContexts[i].drmSession != NULL)
+			{
+				AAMPLOG_INFO("Clearing Session %d, isFailedKeyId=%d, forceClearSession=%d",i, isFailedKeyId, forceClearSession);
+				mLicenseDownloader[i].Clear();
+		    }
+		}
+	}
 }
 
 /**

middleware/drm/DrmSessionManager.cpp

@@ -170,6 +170,18 @@ void DrmSessionManager::clearAccessToken()
 	}
 }
 
+/**
+ * @brief Get the failed key ID status for a specific session
+ */
+bool DrmSessionManager::getFailedKeyIdStatus(int sessionIndex)
+{
+	if (sessionIndex >= 0 && sessionIndex < mMaxDRMSessions && cachedKeyIDs)
+	{
+		return cachedKeyIDs[sessionIndex].isFailedKeyId;
+	}
+	return false;
+}
+
 /**
  * @brief Clean up the Session Data if license key acquisition failed or if LicenseCaching is false.
  */

middleware/drm/DrmSessionManager.h

@@ -301,6 +301,16 @@ class DrmSessionManager
 	 * @return	void.
 	 */
 	void clearFailedKeyIds();
+
+
+	/**
+	 * @fn		getFailedKeyIdStatus
+	 *
+	 * @param	sessionIndex session index to check
+	 * @return	bool - true if the key ID is marked as failed, false otherwise
+	 */
+	bool getFailedKeyIdStatus(int sessionIndex);
+
 	/**
 	 * @fn		clearDrmSession
 	 *

test/utests/fakes/FakeAampDRMSessionManager.cpp

@@ -101,6 +101,11 @@ bool DrmSessionManager::IsKeyIdProcessed(std::vector<uint8_t> keyIdArray, bool &
 	return false;
 }
 
+bool DrmSessionManager::getFailedKeyIdStatus(int sessionIndex)
+{
+	return false;
+}
+
 void DrmSessionManager::clearDrmSession(bool forceClearSession)
 {
 }