--- a/accessoryservices/accessoryserver/src/Policy/AccPolAccessoryPolicy.cpp Tue Aug 31 16:29:05 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Policy/AccPolAccessoryPolicy.cpp Wed Sep 01 12:34:26 2010 +0100
@@ -35,11 +35,7 @@
// CONSTANTS
-#ifdef FF_AUTOMOTIVESTACK
-const TInt KAccMaxRules = 8;
-#else
const TInt KAccMaxRules = 7;
-#endif
const TInt KAccConfigMaxCapabilityGroups = 64;
const TInt KAccGidIntBuf = 100;
@@ -84,7 +80,7 @@
}
// Destructor
-EXPORT_C CAccPolAccessoryPolicy::~CAccPolAccessoryPolicy()
+CAccPolAccessoryPolicy::~CAccPolAccessoryPolicy()
{
API_TRACE_( "[AccFW: ACCPOLICY] CAccPolAccessoryPolicy::~CAccPolAccessoryPolicy()" );
@@ -391,9 +387,6 @@
{KPCWired, KAccMonoAudio},
{KPCBluetooth, KAccStereoAudio},
{KPCBluetooth, KAccMonoAudio},
-#ifdef FF_AUTOMOTIVESTACK
- {KPCUSB, KAccStereoAudio},
-#endif
{KPCWired, 0},
{KPCBluetooth, 0}
};
@@ -473,11 +466,7 @@
}
}
else if ( gID.PhysicalConnectionCaps( KPCWired ) ||
- gID.PhysicalConnectionCaps( KPCHDMI )
-#ifdef FF_AUTOMOTIVESTACK
- || gID.PhysicalConnectionCaps ( KPCUSB )
-#endif
- )
+ gID.PhysicalConnectionCaps( KPCHDMI ) )
{
if( gID.DeviceTypeCaps( KDTHeadset ) )
{
@@ -1250,13 +1239,4 @@
return supportedDevices;
}
-EXPORT_C TBool CAccPolAccessoryPolicy::IsCapabilityDefinedL(
- const TAccPolGenericID& aGenericId,
- const TUint32& aName )
- {
- if(iCapabilityStorage->GetCapability(aGenericId,aName) != NULL)
- return ETrue;
- else
- return EFalse;
- }
// End of File