--- a/omadrm/drmengine/legacy/src/DRMCommon.cpp	Tue Aug 31 15:29:38 2010 +0300
+++ b/omadrm/drmengine/legacy/src/DRMCommon.cpp	Wed Sep 01 12:21:16 2010 +0100
@@ -21,6 +21,7 @@
 #include <f32file.h>
 #include <s32file.h>
 #include <apmstd.h>
+#include <featmgr.h>
 #include <wspdecoder.h>
 #include <wspencoder.h>
 
@@ -1821,7 +1822,8 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void DRMCommon::ConstructL()
     {
-    }
+    FeatureManager::InitializeLibL();
+    } 
 
 // -----------------------------------------------------------------------------
 // DRMCommon::NewL
@@ -1840,6 +1842,7 @@
 // Destructor
 EXPORT_C DRMCommon::~DRMCommon()
     {
+    FeatureManager::UnInitializeLib();
     }
 
 // -----------------------------------------------------------------------------
@@ -2261,7 +2264,15 @@
         DRMCommon::ESeparateDelivery |
         DRMCommon::ESuperDistribution;
 #ifdef __DRM_OMA2
-    aOMALevel = EOMA_2_0;
+    if ( FeatureManager::FeatureSupported( KFeatureIdFfOmadrm2Support ) )
+        {
+        aOMALevel = EOMA_2_0;
+        }
+    else
+        {
+        aOMALevel = EOMA_1_0;
+        }
+    
 #else
     aOMALevel = EOMA_1_0;
 #endif