--- a/uifw/AknGlobalUI/AknCapServer/src/AknCapServerShutdown.cpp Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/AknGlobalUI/AknCapServer/src/AknCapServerShutdown.cpp Wed Sep 01 12:16:19 2010 +0100
@@ -112,14 +112,14 @@
// This UID comes from the app, not the mmp!
TUid uid = doomed->AppUid();
iWs.GetWindowGroupClientThreadId(wgIds->At(ii), threadId);
- thd.Open(threadId);
+ TInt error = thd.Open(threadId);
CleanupClosePushL( thd );
// Is this app OK to kill? We don't kill the this app, EikSrv backdrop or the app that
// instigated the shutdown.
if ((uid != aRequesterUID) && ( uid != KCapServerUid ) && ( uid != KFepSwitchWGId ) &&
( doomed->Caption() != EIKON_SERVER_BACKDROP_WINDOW_GROUP_NAME ) &&
- !IsSystemCriticalThread( thd ) )
+ !IsSystemCriticalThread( thd ) && (!doomed->IsSystem()) && (uid.iUid != 0))
{
TApaTask* harbingerOfDoom = new (ELeave) TApaTask(iWs);
CleanupDeletePushL(harbingerOfDoom);
@@ -251,12 +251,16 @@
{
#ifdef _DEBUG
RDebug::Print(_L("SHUTDOWN: App with ThreadId %d has exited"), TUint(aNotifier->ThreadId()));
+#else
+ aNotifier->ThreadId(); // just for fixing warning
#endif
}
else if (aHowClosed == CAppExitNotifier::EAppExitForced)
{
#ifdef _DEBUG
RDebug::Print(_L("SHUTDOWN: App with ThreadId %d was killed"), TUint(aNotifier->ThreadId()));
+#else
+ aNotifier->ThreadId(); // just for fixing warning
#endif
}
iTotalAppExitNotifiers--;