--- a/omadrm/drmhelper/src/drmhelper.cpp	Thu Oct 14 13:45:23 2010 +0300
+++ b/omadrm/drmhelper/src/drmhelper.cpp	Wed Oct 20 14:56:54 2010 +0300
@@ -946,18 +946,21 @@
     error = stringAttributeSet.GetValue( EContentID, ptr );
     if ( error == KErrNone )
         {
+        // If return value is erroneous it is ignored
         ptr.Set( domainRoUrl->Des() );
-        stringAttributeSet.GetValue( EDomainRightsIssuerUrl, ptr );
-
+        error = stringAttributeSet.GetValue( EDomainRightsIssuerUrl, ptr );
+        
+        // If return value is erroneous it is ignored
+        ptr.Set( domainId->Des() );
+        error = stringAttributeSet.GetValue( EDomainId, ptr );
+        
+        // If return value is erroneous it is ignored
+        ptr.Set( riId->Des() );
+        error = stringAttributeSet.GetValue( EDomainRightsIssuerId, ptr );
+        
         ptr.Set( mimeType->Des() );
         error = stringAttributeSet.GetValue( EMimeType, ptr );
 
-        ptr.Set( riId->Des() );
-        stringAttributeSet.GetValue( EDomainRightsIssuerId, ptr );
-
-        ptr.Set( domainId->Des() );
-        stringAttributeSet.GetValue( EDomainId, ptr );
-
         if ( error == KErrNone )
             {
             ptr.Set( eta->Des() );
@@ -2216,55 +2219,10 @@
 // CDRMHelper::EmbeddedPreviewCompletedL
 // -----------------------------------------------------------------------------
 //
-EXPORT_C TBool CDRMHelper::EmbeddedPreviewCompletedL( CData& aContent )
-    {
-    TBool proceeded = EFalse;
-    if ( iOma2 )
-        {
-        TInt error = KErrNone;
-        TInt canPlay;
-        HBufC* rightsIssuer = NULL;
-        TInt buyRights(0);
-
-        error = aContent.GetAttribute( ECanPlay, canPlay );
-        if ( !error && !canPlay )
-            {
-            TFileName fileName;
-
-            // Get RI URL
-            GetRightsIssuerL( aContent, rightsIssuer );
-            CleanupStack::PushL( rightsIssuer );
-            // Ask if user wants to buy rights
-            error = aContent.GetStringAttribute( EFileName, fileName );
-            if ( !error )
-                {
-                if ( buyRights )
-                    {
-                    // launch browser
-                    LaunchBrowserL( rightsIssuer );
-                    proceeded = ETrue;
-                    }
-                else
-                    {
-                    proceeded = EFalse;
-                    }
-                }
-            else
-                {
-                User::Leave( KErrArgument );
-                }
-            CleanupStack::PopAndDestroy( rightsIssuer );
-            }
-        else
-            {
-            User::Leave( KErrArgument );
-            }
-        }
-    else
-        {
-        User::Leave( KErrNotSupported );
-        }
-    return proceeded;
+EXPORT_C TBool CDRMHelper::EmbeddedPreviewCompletedL( CData& /*aContent*/ )
+    {
+    // Functionality not supported currently
+    return EFalse;
     }
 
 
@@ -3279,7 +3237,11 @@
         }
     if ( aConstraint->GetStartTime( startTime ) == DRMCommon::EOk )
         {
-        aConstraint->GetEndTime( endTime );
+        if ( aConstraint->GetEndTime( endTime ) != DRMCommon::EOk )
+            {
+            // End time is not defined for the constraint
+            endTime = Time::NullTTime();
+            }
         aDuration = endTime.DaysFrom( startTime );
         ret |= KDRMHelperConstraintTime;
         }