Re-merge fix for bug 2485. RCL_3
authorPat Downey <patd@symbian.org>
Tue, 18 May 2010 17:01:48 +0100
branchRCL_3
changeset 18 db335d346487
parent 17 6ba7b7d87ab3 (diff)
parent 13 573550b50543 (current diff)
child 20 d2197ff6de2b
Re-merge fix for bug 2485.
--- a/usbmgmt/usbmgr/usbman/chargingplugin/src/repositorynotifier.cpp	Fri Apr 23 10:15:53 2010 +0100
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/repositorynotifier.cpp	Tue May 18 17:01:48 2010 +0100
@@ -24,7 +24,7 @@
 #include <centralrepository.h>
 
 CUsbChargingRepositoryNotifier::CUsbChargingRepositoryNotifier(MUsbChargingRepositoryObserver& aObserver,const TUid& aRepository, TUint aId)
-: CActive(EPriorityNormal), iObserver(aObserver), iRepositoryUid(aRepository), iId(aId)
+: CActive(CActive::EPriorityStandard), iObserver(aObserver), iRepositoryUid(aRepository), iId(aId)
 	{
 	CActiveScheduler::Add(this);
 	}
--- a/usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.cpp	Fri Apr 23 10:15:53 2010 +0100
+++ b/usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.cpp	Tue May 18 17:01:48 2010 +0100
@@ -969,7 +969,7 @@
 	
 
 CUsbTestConsoleTextEntryBase::CUsbTestConsoleTextEntryBase()
-	: CActive(EPriorityNormal)
+	: CActive(CActive::EPriorityStandard)
 	{
 	CActiveScheduler::Add(this);
 	}