# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275051275 -3600
# Node ID bd9b181e836ad2990a48060c10fe16eafe1210d9
# Parent  ce3df08ce7f64a0b5775eac4882074bd96d36b02# Parent  5791d6d304090a025ff2ebdf43f8fa2d1fe89d84
Re-merge fixes for bug 2707, bug 2121 and bug 1993

diff -r 5791d6d30409 -r bd9b181e836a omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp
--- a/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp	Tue May 18 16:44:25 2010 +0100
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp	Fri May 28 13:54:35 2010 +0100
@@ -468,7 +468,11 @@
             case DRM::EDrmAllowedOutputs:
                 if( dcf2 )
                     {
-                    value = DRM::EDrmAllowAudioAnalog | DRM::EDrmAllowAudioBluetooth | DRM::EDrmAllowVideoMacroVision | DRM::EDrmAllowAudioFmTransmitter;
+                    value = DRM::EDrmAllowAudioAnalog | 
+                            DRM::EDrmAllowAudioBluetooth | 
+                            DRM::EDrmAllowVideoMacroVision | 
+                            DRM::EDrmAllowAudioFmTransmitter | 
+                            DRM::EDrmAllowAudioUsb;
                     }
                 else
                     {
@@ -707,7 +711,11 @@
             case DRM::EDrmAllowedOutputs:
                 if( dcf2 )
                     {
-                    value = DRM::EDrmAllowAudioAnalog | DRM::EDrmAllowAudioBluetooth | DRM::EDrmAllowVideoMacroVision | DRM::EDrmAllowAudioFmTransmitter;
+                    value = DRM::EDrmAllowAudioAnalog | 
+                            DRM::EDrmAllowAudioBluetooth | 
+                            DRM::EDrmAllowVideoMacroVision | 
+                            DRM::EDrmAllowAudioFmTransmitter | 
+                            DRM::EDrmAllowAudioUsb;
                     }
                 else
                     {