MCL/sf/mw/uiaccelerator: comparison uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/src/wsserverdrawercontroller.cpp

equal deleted inserted replaced

-:433cbbb6a04b
+:10534483575f
 		const TUint flags = buf();
 		User::LeaveIfError(aFile.Read(buf));
 		const TUint aToUid = buf();
 		User::LeaveIfError(aFile.Read(buf));
 		const TUint root = buf();
+		User::LeaveIfError(aFile.Read(buf));
+		const TUint sid = buf();
 		if(KErrNone == Append(value)) //dont allow duplicates
 			{
 			const TInt index = IndexOf(value);
 			iAppInfo[index].iFlags = static_cast<TAppInfo::TFlags>(flags);
 			iAppInfo[index].iParent = TUid::Uid(aToUid);
 			iAppInfo[index].iRootWgId = static_cast<TInt>(root);
+			iAppInfo[index].iSecureId = static_cast<TUint>(sid);
 			}
 		}
 	}
 void CAppInfoCache::WriteArrayL(RFile& aFile) const
 		const TAppInfo& info = iAppInfo[i];
 		User::LeaveIfError(aFile.Write(TPckgC<TUint>(info.iUid)));
 		User::LeaveIfError(aFile.Write(TPckgC<TUint>(info.iFlags)));
 		User::LeaveIfError(aFile.Write(TPckgC<TUint>(info.iParent.iUid)));
 		User::LeaveIfError(aFile.Write(TPckgC<TUint>(info.iRootWgId)));
+		User::LeaveIfError(aFile.Write(TPckgC<TUint>(info.iSecureId)));
 		}
 	}
 TInt CAppInfoCache::TAppInfo::Order(const TAppInfo& aNodeA, const TAppInfo& aNodeB)
 	{
 	if( err == KErrAlreadyExists )
 	    {
 	    err = KErrNone;
 	    }
+	__ALFFXLOGSTRING2("CAppInfoCache::SetUid - 0x%x, append result: %d (alf)", aUid, err);
 	return err;
 	}
 void  CAppInfoCache::SetAppFlags(const TUid& aUid, TUint aFlag, TBool aSet)
 	{
 		{
 		if(aSet)
 			iAppInfo[index].iFlags |= aFlag;
 		else
 			iAppInfo[index].iFlags &= ~aFlag;
 		}
+	__ALFFXLOGSTRING2("CAppInfoCache::SetAppFlags - 0x%x, index: %d (alf)", aUid, index);
 	}
 TBool CAppInfoCache::GetAppFlags(const TUid& aUid, TUint aFlag) const
 	{
 	return TBool(iAppInfo[IndexOf(aUid.iUid)].iFlags & aFlag);
 	}
 void CAppInfoCache::SetAvkonUid(const TUid& aUid)
 	{
+__ALFFXLOGSTRING1("CAppInfoCache::SetAvkonUid 0x%x (alf)", aUid)
 	SetAppFlags(aUid, TAppInfo::EAvkonApp, ETrue);
 	}
 void CAppInfoCache::RemoveAvkonUid(const TUid& aUid)
 	{
+__ALFFXLOGSTRING1("CAppInfoCache::RemoveAvkonUid 0x%x (alf)", aUid)
 	SetAppFlags(aUid, TAppInfo::EAvkonApp, EFalse);
 	}
 TBool CAppInfoCache::AvkonUid(const TUid& aUid) const
 void CAppInfoCache::SetParent(const TUid& aUid, const TUid& aParentUid)
 	{
 	iAppInfo[IndexOf(aUid.iUid)].iParent = aParentUid;
 	}
+void CAppInfoCache::SetSecureId( const TUid& aUid, const TSecureId& aSecureId )
+{
+iAppInfo[IndexOf(aUid.iUid)].iSecureId = aSecureId.iId;
+}
+void CAppInfoCache::SetWgId( const TUid& aUid, TInt aWgId )
+{
+iAppInfo[IndexOf(aUid.iUid)].iRootWgId = aWgId;
+}
 TInt CAppInfoCache::SetAction(const TUid& aUid, TInt aAction)
 {
 if (aAction==AknTransEffect::ENone || aUid == KNullUid)
 // ---------------------------------------------------------------------------
 //
 void CWsServerDrawerController::BeginFullscreen(TInt aType, const TUid aUid1, const TUid aUid2, TInt aData )
 	{
 	TUid toUid = iEngine->ToUid();
+	TSecureId toSid = iEngine->ToSid();
+	TInt toWg = iEngine->ToWg();
 	TUid fromUid = iEngine->FromUid();
+	TSecureId fromSid = iEngine->FromSid();
+	TInt fromWg = iEngine->FromWg();
 	TInt flags = iEngine->Flags();
 #ifdef WSSERVERDRAWER_TIME_LOG //time log
 	if(aFromGfx)
 		{
 		iLogger->Log1(_L("CWsServerDrawerController::BeginFullscreen from Gfx time %d"), iLogger->TimeMs());
 TBool isEmbeddedAppContext =
 	(iEngine->Action() == AknTransEffect::EEmbeddedApplicationExit) ||
 	(iEngine->Action() == AknTransEffect::EEmbeddedApplicationStart);
 iAppInfoCache->SetUid(toUid);
+if ( toUid != TUid::Null() )
+{
+iAppInfoCache->SetSecureId( toUid, toSid );
+iAppInfoCache->SetWgId( toUid, toWg );
+}
 iAppInfoCache->SetUid(fromUid);
+if ( fromUid != TUid::Null() )
+{
+iAppInfoCache->SetSecureId( fromUid, fromSid );
+iAppInfoCache->SetWgId( fromUid, fromWg );
+}
 	if ((toUid != KNullUid) && !isEmbeddedAppContext)
 		{
 		//the ok is always reset in the begining
 		if(flags & AknTransEffect::TParameter::EResetServerStats)
 	//activation after exit is not allowed (also if exit didnt result in an effect)
 	if(iLastTypeTried == CStateHandler::EExit &&
 fstype == CStateHandler::EActivation)
 		{ //the current uid is not valid
-	return; // activation not ok if exiting
+__ALFFXLOGSTRING("CWsServerDrawerController::BeginFullscreen - Last tried type was exit. Abort.");
+return; // activation not ok if exiting
 		}
 iLastTypeTried = fstype;
 //activation after exit is not allowed...even it was aborted
 	if(iExitAborted &&
 	 CStateHandler::EActivation == fstype)
 		{ //the current uid is not valid
+__ALFFXLOGSTRING("CWsServerDrawerController::BeginFullscreen - Exit was aborted. Activation should not happen. Abort.");
 		AbortTransition();  //if exit is aborted, we dont want either activation
 	return; // activation not ok if exiting
 		}
 	//dsa apps do not have effects
 	//this is one reason why for activation end cannot be called immediately after begin
 	//we should know if its a dsa app before end can be called
 	if(iDSAActive)
 	    {
+__ALFFXLOGSTRING("CWsServerDrawerController::BeginFullscreen - Phone is booting. Abort.");
 	    return; //Do nothing if dsa active.
 	    }
 	//Special argument calls does not initiate any FS effect and is caught here.
 	// TODO: remove && !iEngine->WaitingForRootWgId() when appuids available from wserv
 	if(fstype == CStateHandler::ENone)
 		{
+__ALFFXLOGSTRING("CWsServerDrawerController::BeginFullscreen - Phone is booting. Abort.");
 		return;
 		}
 	//Phone is booting, stop any FS effect.
 	if(!StartCheck(flags))
 		{
-		AbortTransition();
+__ALFFXLOGSTRING("CWsServerDrawerController::BeginFullscreen - Phone is booting. Abort.");
+AbortTransition();
 		return;
 		}
 	// if either toUid or fromUid is in the custom list for applications
 	// that should be blocked then we abort all ongoing transitions.
 	if(!(AllowedCustomUid(toUid) && AllowedCustomUid(fromUid)))
 {
+__ALFFXLOGSTRING2("CWsServerDrawerController::BeginFullscreen - Blocked uid 0x%x or 0x%x. Abort.", toUid, fromUid);
 AbortTransition();
 return;
 }
 	// No effect if a second exit effect comes in while exit effect is ongoing.
 	//activation switch effects are not allowed for non avkon apps as they never will
 	//inform their foregound - so no transition.
 	if(CStateHandler::EActivation == fstype && currtype != CStateHandler::EStart &&
 	 !iAppInfoCache->AvkonUid(toUid))
 		{
+__ALFFXLOGSTRING1("CWsServerDrawerController::BeginFullscreen - Non avkon app 0x%x. Abort.", toUid);
 		return;
 		}
 if(iEngine->Action() == AknTransEffect::ELayoutSwitch) // ELayoutSwitchOut is for two phases solution
 		{
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CWsServerDrawerController::EndExpired()
 	{
-	__ALFFXLOGSTRING("CWsServerDrawerController::EndExpired >>");
+	__ALFFXLOGSTRING("CWsServerDrawerController::EndExpired (Alf)>>");
 	AbortTransition(EAbortFullscreen);
 	iExitAborted = EFalse; //This is not valid when we have a time-out
-	__ALFFXLOGSTRING("CWsServerDrawerController::EndExpired <<");
+	__ALFFXLOGSTRING("CWsServerDrawerController::EndExpired (Alf)<<");
 	}
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CWsServerDrawerController::EndFullscreen(TBool /*aFromGfx*/)
 	{
+__ALFFXLOGSTRING("CWsServerDrawerController::EndFullscreen (Alf)>>");
 	/*
 	DSA end fix
 	*/
 	if(iDSAActive)
 	    {
+__ALFFXLOGSTRING("CWsServerDrawerController::EndFullscreen - DSA Active - ABORTING (Alf)");
 	    AbortTransition();
 	    return; //Do nothing if dsa active.
 	    }
 #ifdef WSSERVERDRAWER_TIME_LOG //time log
 	iLogger->Log1(_L("CWsServerDrawerController::EndFullscreen time %d"), iLogger->TimeMs());
 #endif	//WSSERVERDRAWER_TIME_LOG
 	iStates->Signal(CStateBase::EEndFullscreen);
+	// the callback for FullScreenFinished will not come. this must be resetted here.
+	iLastTypeTried = CStateHandler::ENone;
 	}
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CWsServerDrawerController::FullscreenFinished(TInt aHandle)
 	{
-	if(aHandle == iEngine->CurrentHandle()) // Filter away stray finish signals.
+	if(aHandle == iEngine->CurrentFullScreenHandle()) // Filter away stray finish signals.
 		{
 		iLastTypeTried = CStateHandler::ENone;
 		iStates->Signal(CStateBase::EFinishFullscreen);
 		}
 	}
 	iStates->Signal(CStateBase::EBeginComponent);
 	if(iStates->GetState() == CStateBase::EComponent)
 		{
-		return iEngine->CurrentHandle();
+		return iEngine->CurrentControlHandle();
 		}
 	else
 		{
 		return KErrAbort;
 		}
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CWsServerDrawerController::EndControlTransition(TInt aHandle)
 	{
-	if(aHandle == iEngine->CurrentHandle()) //Filter out stray endcomponent.
+	if(aHandle == iEngine->CurrentControlHandle()) //Filter out stray endcomponent.
 		{
 		iStates->Signal(CStateBase::EFinishComponent);
 		}
 	}
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CWsServerDrawerController::AbortTransition(TInt aToAbort)
 {
-__ALFFXLOGSTRING("CWsServerDrawerController::AbortTransition >>");
+__ALFFXLOGSTRING("CWsServerDrawerController::AbortTransition (Alf) >>");
 if ( aToAbort == EAbortFullscreen )
 {
 iLastTypeTried = CStateHandler::ENone;
 	    iExitAborted = iStates->GetCurrentFullscreenType() == CStateHandler::EExit;
+	    __ALFFXLOGSTRING1("CWsServerDrawerController::AbortTransition , iExitAborted %d (Alf)", iExitAborted);
 iStates->Signal(CStateBase::EAbortFullscreen);
+iExitAborted = EFalse; // end of story for exit effect.
 }
 else if ( aToAbort == EAbortControl )
 {
 iStates->Signal(CStateBase::EAbortComponent);
 }
 else if( (aToAbort & EAbortControl) && (aToAbort & EAbortFullscreen) )
 	{
 	iLastTypeTried = CStateHandler::ENone;
 	    iExitAborted = iStates->GetCurrentFullscreenType() == CStateHandler::EExit;
-	iStates->Signal(CStateBase::EAbort);
+	    __ALFFXLOGSTRING1("CWsServerDrawerController::AbortTransition , iExitAborted %d (Alf)", iExitAborted);
+	    iStates->Signal(CStateBase::EAbort);
+	iExitAborted = EFalse; // end of story for exit effect.
 	}
-	__ALFFXLOGSTRING("CWsServerDrawerController::AbortTransition <<");
+	__ALFFXLOGSTRING("CWsServerDrawerController::AbortTransition (Alf) <<");
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 TBool CWsServerDrawerController::IsBlocked( const TUid& aFromUid, const TUid& aToUid )
 {
 TBool result = iStates->IsBlocked( aFromUid, aToUid );
-__ALFFXLOGSTRING1("CWsServerDrawerController::IsBlocked - return %d", result);
+__ALFFXLOGSTRING1("CWsServerDrawerController::IsBlocked - return %d (Alf)", result);
 return result;
 }

branch	RCL_3
changeset 6	10534483575f
parent 0	15bf7259bb7c
child 9	3ac8bf5c5014