# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274786002 -10800
# Node ID b6bc347ed8caff359e3e1191b4238fb40b565475
# Parent  cf8bf9651775a244a7c511f46d463366e355d194
Revision: 201014
Kit: 2010121

diff -r cf8bf9651775 -r b6bc347ed8ca datasourceadaptation/gpsdatasourceadaptation/psytester/psytester/src/epos_cpospsymemorytest.cpp
--- a/datasourceadaptation/gpsdatasourceadaptation/psytester/psytester/src/epos_cpospsymemorytest.cpp	Tue May 11 17:31:17 2010 +0300
+++ b/datasourceadaptation/gpsdatasourceadaptation/psytester/psytester/src/epos_cpospsymemorytest.cpp	Tue May 25 14:13:22 2010 +0300
@@ -223,7 +223,7 @@
     TInt& aStackSize)
     {
 	TInt tmp;
-	RHeap heap = User::Heap();
+	RHeap& heap = User::Heap();
 	RThread thread;
 	TThreadStackInfo info;
 	thread.StackInfo(info);
diff -r cf8bf9651775 -r b6bc347ed8ca datasourcemodules/bluetoothgpspositioningmodule/btgpsconfig/group/102869C1.cre
Binary file datasourcemodules/bluetoothgpspositioningmodule/btgpsconfig/group/102869C1.cre has changed
diff -r cf8bf9651775 -r b6bc347ed8ca datasourcemodules/bluetoothgpspositioningmodule/btgpsconfig/group/102869C1.txt
Binary file datasourcemodules/bluetoothgpspositioningmodule/btgpsconfig/group/102869C1.txt has changed
diff -r cf8bf9651775 -r b6bc347ed8ca datasourcemodules/bluetoothgpspositioningmodule/conf/bluetoothgpspsy_102869c1.crml
Binary file datasourcemodules/bluetoothgpspositioningmodule/conf/bluetoothgpspsy_102869c1.crml has changed
diff -r cf8bf9651775 -r b6bc347ed8ca lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/src/LcfCommonProcedures.cpp
--- a/lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/src/LcfCommonProcedures.cpp	Tue May 11 17:31:17 2010 +0300
+++ b/lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/src/LcfCommonProcedures.cpp	Tue May 25 14:13:22 2010 +0300
@@ -139,7 +139,7 @@
     TInt tmp;
 
 
-    RHeap heap = User::Heap();
+    RHeap& heap = User::Heap();
     
     if (!heap.Base())
         {
diff -r cf8bf9651775 -r b6bc347ed8ca locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h
--- a/locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h	Tue May 11 17:31:17 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h	Tue May 25 14:13:22 2010 +0300
@@ -209,7 +209,7 @@
 
         void DeferNotificationL();
         void CreateNotificationAndEnqueueL();
-
+        void UpdateProperty();
     private:    // Data
         RNotifier                       iNotifier;
         RArray<TRequest>                iRequestQueue;
diff -r cf8bf9651775 -r b6bc347ed8ca locationrequestmgmt/networkrequesthandler/src/EPos_CPosDialogCtrl.cpp
--- a/locationrequestmgmt/networkrequesthandler/src/EPos_CPosDialogCtrl.cpp	Tue May 11 17:31:17 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/src/EPos_CPosDialogCtrl.cpp	Tue May 25 14:13:22 2010 +0300
@@ -17,6 +17,7 @@
 
 // INCLUDE FILES
 #include <s32mem.h>
+#include <e32property.h>
 #include <lbs/epos_privacy.h>
 #include <lbs/epos_cposcontactrequestor.h>
 #include <lbs/epos_cposservicerequestor.h>
@@ -36,6 +37,9 @@
 const TUid KNotifierUid = { KPosPrivacyNotifierImplUid };
 #endif // NRH_UNIT_TEST
 
+// P&S Key so NG can check the status of notifications
+const TInt EPrivacyNumberOfRequest = 0x1028720F;
+
 // The output descriptor for Notifier calls. Since we want to pass
 // just a dummy null descriptor there is no need to create a HBufC
 // each time.
@@ -58,6 +62,10 @@
     {
     TInt err = iNotifier.Connect();
     User::LeaveIfError(err);
+    
+    // Define the property
+    RProperty::Define(KUidSystemCategory, EPrivacyNumberOfRequest, RProperty::EInt);
+    UpdateProperty();
     }
 
 // Two-phased constructor.
@@ -82,6 +90,7 @@
 
     iNotifier.Close();
     iRequestQueue.Close();
+    RProperty::Delete(KUidSystemCategory, EPrivacyNumberOfRequest);
     }
 
 // ---------------------------------------------------------
@@ -289,6 +298,7 @@
         }
     iRequestQueue.Remove(aIndex);
     iRequestQueue.Compress();
+    UpdateProperty();
     }
 
 // ---------------------------------------------------------
@@ -302,6 +312,7 @@
     // Start a new request.    
     aRequest.iId = ++iRequestId;
     User::LeaveIfError(iRequestQueue.Append(aRequest));
+    UpdateProperty();
 
     if (iRequestQueue.Count() == 1)
         {
@@ -617,11 +628,13 @@
 		if ( iRequestQueue[i].iType == TPosQNInputData::ENotification )
 			{
 			User::LeaveIfError(iRequestQueue.Insert( aRequest,i ));
+			UpdateProperty();
 			return;
 			}
 		}
 	
     User::LeaveIfError(iRequestQueue.Append(aRequest));
+    UpdateProperty();
     }
 
 // ---------------------------------------------------------
@@ -641,6 +654,7 @@
 		}
 	iRequestQueue.Remove(0);
     iRequestQueue.Compress();
+    UpdateProperty();
 	NextRequest();	
 	}
 
@@ -685,4 +699,11 @@
     CleanupStack::Pop(requestinfocopy);
     
 	}
+
+void CPosDialogCtrl::UpdateProperty()
+    {
+    RProperty::Set(KUidSystemCategory, EPrivacyNumberOfRequest, iRequestQueue.Count());
+    }
+
+
 //  End of File
diff -r cf8bf9651775 -r b6bc347ed8ca networkprotocolmodules/privacyprotocolmodule/PrivacyProtocolModule/inc/privacyshutdown.h
--- a/networkprotocolmodules/privacyprotocolmodule/PrivacyProtocolModule/inc/privacyshutdown.h	Tue May 11 17:31:17 2010 +0300
+++ b/networkprotocolmodules/privacyprotocolmodule/PrivacyProtocolModule/inc/privacyshutdown.h	Tue May 25 14:13:22 2010 +0300
@@ -58,6 +58,7 @@
 private:
 	
 	TShutdownState iState;
+	TTimeIntervalMicroSeconds32 iTimerCount;
 	};
 	
 #endif // __PRIVACYSHUTDOWN_H__