equal
deleted
inserted
replaced
775 else |
775 else |
776 { |
776 { |
777 if (StartUp) |
777 if (StartUp) |
778 isConditionSatisfied = ETrue; |
778 isConditionSatisfied = ETrue; |
779 } |
779 } |
|
780 |
|
781 // call TARM so that it verifies that configuration is in sync. This might internally accept the (default) lock code, but doesn't dismiss the query. |
|
782 #if defined(_DEBUG) |
|
783 RDebug::Printf( "%s %s (%u) pre isConditionSatisfied=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, isConditionSatisfied ); |
|
784 #endif |
|
785 RSCPClient scpClientConfiguration; |
|
786 User::LeaveIfError( scpClientConfiguration.Connect() ); |
|
787 CleanupClosePushL( scpClientConfiguration ); |
|
788 #if defined(_DEBUG) |
|
789 RDebug::Printf( "%s %s (%u) calling CheckConfiguration KSCPComplete=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, KSCPComplete ); |
|
790 #endif |
|
791 TInt finalConfStatus = scpClientConfiguration.CheckConfiguration( KSCPComplete ); |
|
792 #if defined(_DEBUG) |
|
793 RDebug::Printf( "%s %s (%u) finalConfStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, finalConfStatus ); |
|
794 RDebug::Printf( "%s %s (%u) isConditionSatisfied=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, isConditionSatisfied ); |
|
795 #endif |
|
796 CleanupStack::PopAndDestroy(); // scpClientConfiguration |
|
797 |
780 if (isConditionSatisfied) |
798 if (isConditionSatisfied) |
781 { |
799 { |
782 #if defined(_DEBUG) |
800 #if defined(_DEBUG) |
783 RDebug::Print(_L("(SECUI)CSecurityHandler::PassPhraseRequiredL() Dialog 1")); |
801 RDebug::Print(_L("(SECUI)CSecurityHandler::PassPhraseRequiredL() Dialog 1")); |
784 #endif |
802 #endif |