MCL/sf/mw/uiaccelerator: comparison uiacceltk/hitchcock/goommonitor/src/goomactionlist.cpp

equal deleted inserted replaced

-:c9d868f1e20c
+:1801340c26a2
 TInt oldcount = iActionRefs.Count();
 if (aWindowGroupList.Count())
 {
 // Go through each item in the wglist, create an app close action for this application
-TInt wgIndex = aWindowGroupList.Count() - 1;
+TInt wgIndex = 0;
 TRACES1("BuildActionListL: Windowgroup list count %d ",aWindowGroupList.Count());
 // Fix for when fast swap has focus, or pen input server has put itself into the foreground:
 // the wg at index 1 should be considered as the foreground app.
 // stopIndex is calculated to take this into account.
 TUid foregroundUid = TUid::Uid(iMonitor.ForegroundAppUid());
 TRACES1("BuildActionListL: Foreground App %x ", foregroundUid);
-while (wgIndex >= 0)
+while (wgIndex < aWindowGroupList.Count())
 {
 CGOomCloseAppConfig* appCloseConfig = NULL;
 // Get the app ID for the wglist item
 // This sets the window group name
 TInt32 appId = aWindowGroupList.AppId(wgIndex, ETrue);
 if(AppCloseActionAlreadyExists(aWindowGroupList, appId))
 {
-wgIndex--;
+TRACES2("CGOomActionList::BuildKillAppActionListL - Action item already exists for this app %x wgid %d", appId, aWindowGroupList.WgId(wgIndex).iId)
+wgIndex++;
 continue;
 }
 CApaWindowGroupName* wgName = aWindowGroupList.WgName();
 __ASSERT_DEBUG(wgName, GOomMonitorPanic(KInvalidWgName));
 User::Leave(err);
 }
 TRACES3("BuildActionListL: Adding app to action list, Uid = %x, wgId = %d, wgIndex = %d", appId, wgId, wgIndex);
 }
-wgIndex--;
+wgIndex++;
 }
 }
 TRACES1("BuildActionListL: Action list built with %d  new items",iActionRefs.Count()- oldcount);
 }
 {
 TActionRef ref = iActionRefs[i];
 if(ref.Type() == TActionRef::EAppClose )
 {
 if(aWindowGroupList.AppIdfromWgId(ref.WgId(), ETrue) == appId)
+{
+TRACES2("CGOomActionList::AppCloseActionAlreadyExists AppId %x already added with wgid %d",appId, ref.WgId());
 return ETrue;
+}
 }
 }
 return EFalse;
 }
 void CGOomActionList::AppNotExiting(TInt aWgId)
 {
 FUNC_LOG;
-TInt index = iCloseAppActions.Count();
+TInt index = 0;
-TRACES1("CGOomCloseApp::AppNotExiting: count of actions %d",index);
+while (index < iCloseAppActions.Count())
-while (index--)
 {
 CGOomCloseApp* action = iCloseAppActions[index];
-TRACES3("CGOomCloseApp::AppNotExiting: %d %d %d", aWgId, action->WgId(), action->IsRunning());
+TRACES3("CGOomCloseApp::AppNotExiting: recvd from %d , checking against %d , isRunning %d", aWgId, action->WgId(), action->IsRunning());
 if ( (action->WgId() == aWgId) && (action->IsRunning()) )
 {
-TRACES1("CGOomCloseApp::AppNotExiting: App with window group id %d has not responded to the close event", aWgId);
+TRACES1("CGOomCloseApp::AppNotExiting: App with window group id %d has responded to the close event", aWgId);
 action->CloseAppEvent();
-}
+break;
+}
+index++;
 }
 }
 // From MGOomActionObserver
 // An action has changed state (possibly it has completed freeing memory)

branch	RCL_3
changeset 18	1801340c26a2
parent 17	c9d868f1e20c
child 19	e5af45d51884