equal
deleted
inserted
replaced
823 CleanupStack::PopAndDestroy(&augmentationArray); |
823 CleanupStack::PopAndDestroy(&augmentationArray); |
824 } |
824 } |
825 |
825 |
826 void CInstallationProcessor::AddAppArcRegResourceFilesForRegEntryL(RSisRegistryEntry& aEntry) |
826 void CInstallationProcessor::AddAppArcRegResourceFilesForRegEntryL(RSisRegistryEntry& aEntry) |
827 { |
827 { |
|
828 |
|
829 // Don't add files belonging to the registry entry present in ROM if SA upgrade is detected |
|
830 if ( aEntry.IsInRomL() && ApplicationL().ControllerL().Info().InstallType() == Sis::EInstInstallation ) |
|
831 { |
|
832 return; |
|
833 } |
|
834 |
828 RPointerArray<HBufC> filesArray; |
835 RPointerArray<HBufC> filesArray; |
829 CleanupResetAndDestroyPushL(filesArray); |
836 CleanupResetAndDestroyPushL(filesArray); |
830 aEntry.FilesL(filesArray); |
837 aEntry.FilesL(filesArray); |
831 TInt count = filesArray.Count(); |
838 TInt count = filesArray.Count(); |
832 CSisRegistryPackage *regPkg = aEntry.PackageL(); |
839 CSisRegistryPackage *regPkg = aEntry.PackageL(); |