equal
deleted
inserted
replaced
151 { |
151 { |
152 FUNC_LOG; |
152 FUNC_LOG; |
153 // Start a timer and the thread watcher |
153 // Start a timer and the thread watcher |
154 iAppCloseTimer->SetState(CGOomAppCloseTimer::EGOomAppClosing); |
154 iAppCloseTimer->SetState(CGOomAppCloseTimer::EGOomAppClosing); |
155 iAppCloseTimer->After(iCloseTimeout * 1000); |
155 iAppCloseTimer->After(iCloseTimeout * 1000); |
|
156 iAppCloseWatcher->Start(iCurrentTask); |
156 // Tell the app to close |
157 // Tell the app to close |
157 // We are not asking system applications to exit anyway, so we'll send legacy event only |
158 // We are not asking system applications to exit anyway, so we'll send legacy event only |
158 // even we have powermgmt capability |
159 // even we have powermgmt capability |
159 TRACES2("CGOomCloseApp::FreeMemory: Closing app with window group id %d Timeout = %d",iWgId, iCloseTimeout); |
160 TRACES2("CGOomCloseApp::FreeMemory: Closing app with window group id %d Timeout = %d",iWgId, iCloseTimeout); |
160 TWsEvent event; |
161 TWsEvent event; |
182 { |
183 { |
183 iAppCloseWatcher->Cancel(); |
184 iAppCloseWatcher->Cancel(); |
184 } |
185 } |
185 |
186 |
186 if(IsConsumingMemory(iWgId)) |
187 if(IsConsumingMemory(iWgId)) |
187 { |
188 { |
|
189 TRACES1("REST IN PEACE - App wgid %d", iWgId); |
188 iCurrentTask.KillTask(); |
190 iCurrentTask.KillTask(); |
189 iAppCloserRunning = EFalse; // not sure if intended (?) |
191 iAppCloserRunning = EFalse; // not sure if intended (?) |
190 iAppCloseTimer->SetState(CGOomAppCloseTimer::EGOomAppKilled); |
192 iAppCloseTimer->SetState(CGOomAppCloseTimer::EGOomAppKilled); |
191 iAppCloseTimer->After(iWaitAfterClose * 1000); |
193 iAppCloseTimer->After(iWaitAfterClose * 1000); |
192 } |
194 } |
193 else |
195 else |
194 { // application has released its graphics resources -> we are no more interested about it |
196 { // application has released its graphics resources -> we are no more interested about it |
195 CloseAppEvent(); |
197 //CloseAppEvent(); |
|
198 iAppCloserRunning = EFalse; |
|
199 MemoryFreed(KErrNone); |
196 } |
200 } |
197 //MemoryFreed(KErrNone); |
|
198 } |
201 } |
199 |
202 |
200 void CGOomCloseApp::KillTaskWaitDone() |
203 void CGOomCloseApp::KillTaskWaitDone() |
201 { |
204 { |
202 FUNC_LOG; |
205 FUNC_LOG; |