--- a/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp	Tue Aug 31 15:29:38 2010 +0300
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp	Wed Sep 01 12:21:16 2010 +0100
@@ -29,6 +29,7 @@
 #include <caf/caferr.h>
 #include <utf.h>
 #include <drmagents.h>
+#include <featmgr.h>
 #include "Oma2Agent.h"
 #include "Oma2AgentAttributes.h"
 #include "Oma1Dcf.h"
@@ -81,9 +82,6 @@
     DRM::EDrmAllowVideoMacroVision |
     DRM::EDrmAllowAudioUsb |   
     DRM::EDrmAllowAudioHdmiHdcpRequired |
-    DRM::EDrmAllowAudioHdmi |
-    DRM::EDrmAllowVideoHDMI  |
-    DRM::EDrmAllowVideoHdmiHdcpRequested |
     DRM::EDrmAllowVideoHdmiHdcpRequired;
 
 // ============================= LOCAL FUNCTIONS ===============================
@@ -1023,14 +1021,26 @@
                     }
                 break;
             case ERightsIssuerUrl:
-#ifndef __DRM_FULL
-                err = KErrNotSupported;
-#else
-                if (aDcfFile.iRightsIssuerURL != NULL)
+                TRAP(ret, FeatureManager::InitializeLibL());
+                
+                if (!ret && FeatureManager::FeatureSupported(KFeatureIdFfOmadrm1FullSupport))
                     {
-                    TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*aDcfFile.iRightsIssuerURL));
+                    if (aDcfFile.iRightsIssuerURL != NULL)
+                        {
+                        TRAP(err, b = CnvUtfConverter::ConvertToUnicodeFromUtf8L(
+                                *aDcfFile.iRightsIssuerURL));
+                        }
                     }
-#endif
+                else
+                    {
+                    err = KErrNotSupported;
+                    }
+                
+                if (!ret)
+                    {
+                    FeatureManager::UnInitializeLib();
+                    }
+                
                 break;
             case ETransactionTrackingId:
                 if (dcf2 != NULL && dcf2->iTransactionTracking)