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

diff -r b6bc347ed8ca -r a3482a8f15d8 lbstest/lbstestproduct/group/lbs_testproduct.mrp
--- a/lbstest/lbstestproduct/group/lbs_testproduct.mrp	Tue May 25 14:13:22 2010 +0300
+++ b/lbstest/lbstestproduct/group/lbs_testproduct.mrp	Wed Jun 09 11:13:47 2010 +0300
@@ -16,14 +16,11 @@
 
 component	lbs_testproduct
 
-source \sf\os\lbs\lbstest\lbstestproduct\test_group
-source \sf\os\lbs\lbstest\lbstestproduct\internal
-source \sf\os\lbs\lbstest\lbstestproduct\tdxml
+
 source \sf\os\lbs\lbstest\lbstestproduct
-source \sf\os\lbs\lbstest\lbstestproduct\cit
-source \sf\os\lbs\lbstest\lbstestproduct\ut
+
 
-exports	\sf\os\lbs\lbstest\lbstestproduct\group
+exports	\sf\os\lbs\lbstest\lbstestproduct\test_group
 
 notes_source	\component_defs\release.src
 
diff -r b6bc347ed8ca -r a3482a8f15d8 locationrequestmgmt/locationserver/test/te_locsrv/scripts/te_locsrvsuite.script
--- a/locationrequestmgmt/locationserver/test/te_locsrv/scripts/te_locsrvsuite.script	Tue May 25 14:13:22 2010 +0300
+++ b/locationrequestmgmt/locationserver/test/te_locsrv/scripts/te_locsrvsuite.script	Wed Jun 09 11:13:47 2010 +0300
@@ -22,7 +22,34 @@
 LOAD_SUITE te_locsrvsuite
 
 PREFIX RUN_UTILS
+DeleteFile c:\config.txt
 CopyFile c:\testdata\configs\te_locsrv_testconfig.txt c:\config.txt
+CopyFile c:\testdata\configs\03138005.cre c:\private\10202be9\03138005.cre
+CopyFile c:\testdata\configs\03138005.cre c:\private\10202be9\persists\03138005.cre
+CopyFile c:\testdata\configs\03138007.cre c:\private\10202be9\03138007.cre
+CopyFile c:\testdata\configs\03138007.cre c:\private\10202be9\persists\03138007.cre
+CopyFile c:\testdata\configs\03138001.cre c:\private\10202be9\03138001.cre
+CopyFile c:\testdata\configs\03138001.cre c:\private\10202be9\persists\03138001.cre
+CopyFile c:\testdata\configs\03138003.cre c:\private\10202be9\03138003.cre
+CopyFile c:\testdata\configs\03138003.cre c:\private\10202be9\persists\03138003.cre
+CopyFile c:\testdata\configs\03138009.cre c:\private\10202be9\03138009.cre
+CopyFile c:\testdata\configs\03138009.cre c:\private\10202be9\persists\03138009.cre
+CopyFile c:\testdata\configs\0313800b.cre c:\private\10202be9\0313800b.cre
+CopyFile c:\testdata\configs\0313800b.cre c:\private\10202be9\persists\0313800b.cre
+CopyFile c:\testdata\configs\03133002.cre c:\private\10202be9\03133002.cre
+CopyFile c:\testdata\configs\03133002.cre c:\private\10202be9\persists\03133002.cre
+CopyFile c:\testdata\configs\03133004.cre c:\private\10202be9\03133004.cre
+CopyFile c:\testdata\configs\03133004.cre c:\private\10202be9\persists\03133004.cre
+CopyFile c:\testdata\configs\03133006.cre c:\private\10202be9\03133006.cre
+CopyFile c:\testdata\configs\03133006.cre c:\private\10202be9\persists\03133006.cre
+CopyFile c:\testdata\configs\0313300C.cre c:\private\10202be9\0313300C.cre
+CopyFile c:\testdata\configs\0313300C.cre c:\private\10202be9\persists\0313300C.cre
+CopyFile c:\testdata\configs\03133026.cre c:\private\10202be9\03133026.cre
+CopyFile c:\testdata\configs\03133026.cre c:\private\10202be9\persists\03133026.cre
+CopyFile c:\testdata\configs\03133028.cre c:\private\10202be9\03133028.cre
+CopyFile c:\testdata\configs\03133028.cre c:\private\10202be9\persists\03133028.cre
+CopyFile c:\testdata\configs\0313302A.cre c:\private\10202be9\0313302A.cre
+CopyFile c:\testdata\configs\0313302A.cre c:\private\10202be9\persists\0313302A.cre
 REMOVE_PREFIX
 
 
diff -r b6bc347ed8ca -r a3482a8f15d8 locationrequestmgmt/networkrequesthandler/src/privacyadvancednotifierhandler.cpp
--- a/locationrequestmgmt/networkrequesthandler/src/privacyadvancednotifierhandler.cpp	Tue May 25 14:13:22 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/src/privacyadvancednotifierhandler.cpp	Wed Jun 09 11:13:47 2010 +0300
@@ -148,7 +148,8 @@
 	// Record the highest session Id so far.
 	// We need this in case we need to check if a new request
 	// is actually a repeat of an old request.
-	if (aSessionId.SessionNum() > iHighestSessionId.SessionNum())
+	if ((aSessionId.SessionNum() > iHighestSessionId.SessionNum()) &&
+	    (aNetPosRequestPrivacy.RequestAdvice() == TLbsNetPosRequestPrivacyInt::ERequestAdviceVerify))
 		{
 		iHighestSessionId = aSessionId;
 		}
@@ -593,9 +594,10 @@
 				// NotifyVerificationTimeout() on the Network Privacy API.)
 				// We should use a different notification reason for these
 				// types of request.
-				if (request->SessionId().SessionNum() < iHighestSessionId.SessionNum())
+				if (request->SessionId().SessionNum() <= iHighestSessionId.SessionNum())
 					{
 					data.iNotificationReason = EPosVerificationTimeout;
+					data.iRequestDecision = (aRequestPrivacy.RequestAction() == TLbsNetPosRequestPrivacyInt::ERequestActionAllow) ? EPosDecisionAccepted : EPosDecisionRejected;
 					}
 				else
 					{