diff -r 04da681812a9 -r 457cd4423b8c omadrm/drmengine/dcf/src/Oma2Dcf.cpp --- a/omadrm/drmengine/dcf/src/Oma2Dcf.cpp Tue Apr 27 16:56:11 2010 +0300 +++ b/omadrm/drmengine/dcf/src/Oma2Dcf.cpp Tue May 11 16:28:38 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 - 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include "Oma2Agent.h" @@ -291,11 +292,24 @@ const TDesC8& aDcfFragment ) { TBool r( EFalse ); + TInt err( KErrNone ); if ( aDcfFragment.Length() >= KBrandingSize && aDcfFragment.Left( KBrandingSize ).Compare( KOma2DcfBranding ) == 0 ) { - r = ETrue; + + TRAP( err, FeatureManager::InitializeLibL() ); + + if ( !err && FeatureManager::FeatureSupported( KFeatureIdFfOmadrm2Support ) ) + { + r = ETrue; + } + + if ( !err ) + { + FeatureManager::UnInitializeLib(); + } + } return r; }