equal
deleted
inserted
replaced
29 #include <cmconnectionmethod.h> |
29 #include <cmconnectionmethod.h> |
30 #include <DevManInternalCRKeys.h> |
30 #include <DevManInternalCRKeys.h> |
31 #include <nsmlconstants.h> |
31 #include <nsmlconstants.h> |
32 #include <centralrepository.h> |
32 #include <centralrepository.h> |
33 #include <sysversioninfo.h> |
33 #include <sysversioninfo.h> |
|
34 #include <featdiscovery.h> |
34 #include "FotaSrvApp.h" |
35 #include "FotaSrvApp.h" |
35 #include "FotaServer.h" |
36 #include "FotaServer.h" |
36 #include "FotaSrvDebug.h" |
37 #include "FotaSrvDebug.h" |
37 #include "FotasrvSession.h" |
38 #include "FotasrvSession.h" |
38 #include "fotaConst.h" |
39 #include "fotaConst.h" |
2413 else |
2414 else |
2414 { |
2415 { |
2415 __LEAVE_IF_ERROR(err); |
2416 __LEAVE_IF_ERROR(err); |
2416 } |
2417 } |
2417 } |
2418 } |
|
2419 |
|
2420 if(!IsFOTANeedToDecryptL()) |
|
2421 { |
|
2422 iDEController->CheckIfDeviceMemoryBusyL(); |
|
2423 return EFalse; |
|
2424 } |
|
2425 |
|
2426 |
2418 TRAPD(err, ret = iDEController->NeedToDecryptL(drive)); |
2427 TRAPD(err, ret = iDEController->NeedToDecryptL(drive)); |
2419 |
2428 |
2420 delete iDEController; iDEController = NULL; |
2429 delete iDEController; iDEController = NULL; |
2421 |
2430 |
2422 if (err == KErrNotSupported) |
2431 if (err == KErrNotSupported) |
2588 |
2597 |
2589 FLOG(_L("CFotaServer::GetDEOperation, ret = %d <<"), ret); |
2598 FLOG(_L("CFotaServer::GetDEOperation, ret = %d <<"), ret); |
2590 return ret; |
2599 return ret; |
2591 } |
2600 } |
2592 |
2601 |
|
2602 // -------------------------------------------------------------------------- |
|
2603 // CFotaServer::IsFOTANeedToDecryptL |
|
2604 // This method returns the device encryption operation. |
|
2605 // |
|
2606 // -------------------------------------------------------------------------- |
|
2607 // |
|
2608 TBool CFotaServer::IsFOTANeedToDecryptL() |
|
2609 { |
|
2610 FLOG(_L("CFotaServer::IsFOTANeedToDecryptL >>")); |
|
2611 |
|
2612 TBool ret(EFalse); |
|
2613 ret = CFeatureDiscovery::IsFeatureSupportedL(TUid::Uid(KFeatureIdFfFotaDecryptMemBeforeUpdate)); |
|
2614 |
|
2615 FLOG(_L("CFotaServer::IsFOTANeedToDecryptL, ret = %d <<"), ret); |
|
2616 return ret; |
|
2617 } |
|
2618 |
|
2619 |