# HG changeset patch
# User hgs
# Date 1281954210 -10800
# Node ID d55467af0fda9158a6c7f989d80033025afe1a04
# Parent  ee8c7592be5a804a07af509912af50363ac855a6
201033_01

diff -r ee8c7592be5a -r d55467af0fda commonappservices/alarmserver/Server/Source/ASSrvAlarmQueue.cpp
--- a/commonappservices/alarmserver/Server/Source/ASSrvAlarmQueue.cpp	Fri Aug 06 10:45:02 2010 +0300
+++ b/commonappservices/alarmserver/Server/Source/ASSrvAlarmQueue.cpp	Mon Aug 16 13:23:30 2010 +0300
@@ -96,7 +96,7 @@
 	iASSrvDSTChange = CASSrvDSTChange::NewL(*this);
 
 #ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT
-	iSsmRtcAdaptation.Connect();
+	User::LeaveIfError(iSsmRtcAdaptation.Connect());
 	// Notify the listeners of 'KWakeupAlarmPubSubKey' key that the alarm queue is yet  to be internalized 
 	// by Alarm Server on its start-up at the device boot time.
 	RProperty::Define(KAlarmServerPubSubCategory, KWakeupAlarmPubSubKey, RProperty::EInt, KReadPolicy, KWritePolicy);
diff -r ee8c7592be5a -r d55467af0fda coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp
--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Fri Aug 06 10:45:02 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Mon Aug 16 13:23:30 2010 +0300
@@ -52,7 +52,7 @@
 const TUint KCoreAppUIsMmcRemovedWithoutEjectCmdMask = 0xFFFF;
 const TUint KCoreAppUIsMmcRemovedWithoutEjectValShift = 16;
 
-_LIT(KGpsIndicatorPlugin, "PositioningIndicator");
+_LIT(KGpsIndicatorPlugin, "com.nokia.positioning.indicatorplugin/1.0");
 const TUid KPSUidSecurityUIs = { 0x100059b5 };
 const TUint32 KSecurityUIsLights  = 0x00000308;
 
diff -r ee8c7592be5a -r d55467af0fda sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp
--- a/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp	Fri Aug 06 10:45:02 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp	Mon Aug 16 13:23:30 2010 +0300
@@ -193,13 +193,17 @@
         {
         RProcess processName;
         err = clientThread.Process(processName);
-        dataPaged = processName.DefaultDataPaged();
+        if(err == KErrNone)
+            {
+            dataPaged = processName.DefaultDataPaged();
+            processName.Close();
+            }
+        clientThread.Close();
         }
     else
         {
         OomMonitorPanic(KInvalidClientRequestType);
-        }
-    
+        }    
     
     switch (request->iClientRequestType)
         {
diff -r ee8c7592be5a -r d55467af0fda sysresmonitoring/oommonitor/src/oomcloseapp.cpp
--- a/sysresmonitoring/oommonitor/src/oomcloseapp.cpp	Fri Aug 06 10:45:02 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomcloseapp.cpp	Mon Aug 16 13:23:30 2010 +0300
@@ -59,15 +59,20 @@
     
     RThread thread;
     TInt err=thread.Open(iCurrentTask.ThreadId());
-    if (!err)
+    if (err == KErrNone)
         {
         RProcess process;
-        thread.Process(process);
-        TBool isDataPaged = process.DefaultDataPaged();
-        if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged ))
+        err = thread.Process(process);
+        if(err == KErrNone)
             {
-            iCurrentTask.EndTask();
+            TBool isDataPaged = process.DefaultDataPaged();
+            if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged ))
+                {
+                iCurrentTask.EndTask();
+                }                    
+            process.Close();
             }
+        thread.Close();
         }
     }
 
diff -r ee8c7592be5a -r d55467af0fda sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp
--- a/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp	Fri Aug 06 10:45:02 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp	Mon Aug 16 13:23:30 2010 +0300
@@ -73,9 +73,12 @@
         if(err == KErrNone)
             {
             dataPaged = processName.DefaultDataPaged();
+            processName.Close();
+            clientThread.Close();
             }
         else
             {
+            clientThread.Close();                        
             PanicClient(aMessage, EPanicIllegalFunction);
             }
         }