# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1274198508 -3600
# Node ID db335d34648757bc617533a63c627f8045a4ed73
# Parent  6ba7b7d87ab3c8eefb20c2ba2f5ddf4abc568460# Parent  573550b5054349718ab55beb1e4f7865aefc7182
Re-merge fix for bug 2485.

diff -r 573550b50543 -r db335d346487 usbmgmt/usbmgr/usbman/chargingplugin/src/repositorynotifier.cpp
--- 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);
 	}
diff -r 573550b50543 -r db335d346487 usbmgmt/usbmgrtest/usbtestconsole/usbtestconsole.cpp
--- 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);
 	}