Merge fixes for bugs 1993 and 2707.
--- a/commondrm/drmrightsmanagerui/inc/DRMRightsMgrAppUi.h Fri May 21 17:35:40 2010 +0100
+++ b/commondrm/drmrightsmanagerui/inc/DRMRightsMgrAppUi.h Wed Jun 02 08:46:57 2010 -0700
@@ -25,9 +25,9 @@
#include <AknProgressDialog.h>
#include <apparc.h>
#include <DRMRightsClient.h>
-#include <drmconstraint.h>
+#include <DrmConstraint.h>
-#include "drmclockclient.h"
+#include "DRMClockClient.h"
#include "DrmViewItems.h"
#include "DRMRightsManager.hrh"
--- a/commondrm/drmutility/src/DrmUtilityDmgrWrapper.cpp Fri May 21 17:35:40 2010 +0100
+++ b/commondrm/drmutility/src/DrmUtilityDmgrWrapper.cpp Wed Jun 02 08:46:57 2010 -0700
@@ -26,7 +26,7 @@
#include <StringLoader.h>
#include <data_caging_path_literals.hrh>
-#include <downloadmgrclient.h> //download manager
+#include <DownloadMgrClient.h> //download manager
#include <es_enum.h> // tconnectioninfo
#include <es_enum_partner.h> // TConnectionInfoV2
#include <es_sock.h> // rconnection rsocket
--- a/commondrm/drmutility/traces/OstTraceDefinitions.h Fri May 21 17:35:40 2010 +0100
+++ b/commondrm/drmutility/traces/OstTraceDefinitions.h Wed Jun 02 08:46:57 2010 -0700
@@ -19,5 +19,5 @@
// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
+#include <opensystemtrace.h>
#endif
--- a/drm_plat/dcf_repository_api/inc/DcfRep.h Fri May 21 17:35:40 2010 +0100
+++ b/drm_plat/dcf_repository_api/inc/DcfRep.h Wed Jun 02 08:46:57 2010 -0700
@@ -23,7 +23,7 @@
// INCLUDES
#include <e32base.h>
#include <f32file.h>
-#include <d32dbms.H>
+#include <d32dbms.h>
#include "DcfRepCli.h"
// CONSTANTS
// MACROS
--- a/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp Fri May 21 17:35:40 2010 +0100
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp Wed Jun 02 08:46:57 2010 -0700
@@ -467,7 +467,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
{
@@ -706,7 +710,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
{