equal
deleted
inserted
replaced
146 _LIT(KPanic,"MSENG"); |
146 _LIT(KPanic,"MSENG"); |
147 __ASSERT_ALWAYS((CMseng::IsInternalDrive(aFsSession, iCurrentScannedDrive) |
147 __ASSERT_ALWAYS((CMseng::IsInternalDrive(aFsSession, iCurrentScannedDrive) |
148 || CMseng::IsRemovableDrive(aFsSession, iCurrentScannedDrive)), |
148 || CMseng::IsRemovableDrive(aFsSession, iCurrentScannedDrive)), |
149 User::Panic(KPanic, KErrNotSupported)); |
149 User::Panic(KPanic, KErrNotSupported)); |
150 |
150 |
151 if(CMseng::IsInternalDrive(aFsSession, iCurrentScannedDrive)) |
151 if( CMseng::IsInternalDrive(aFsSession, iCurrentScannedDrive) |
|
152 && !CMseng::IsMassStorageDrive( aFsSession, iCurrentScannedDrive ) ) |
152 { |
153 { |
153 theReader.OpenLC( &aResFile, C_DIRECTORIES ); |
154 theReader.OpenLC( &aResFile, C_DIRECTORIES ); |
154 iDirArray = theReader.ReadDesCArrayL(); |
155 iDirArray = theReader.ReadDesCArrayL(); |
155 CleanupStack::PopAndDestroy( &theReader ); |
156 CleanupStack::PopAndDestroy( &theReader ); |
156 // |
157 // |
160 // |
161 // |
161 theReader.OpenLC( &aResFile, C_SPECIAL_DATADIRS ); |
162 theReader.OpenLC( &aResFile, C_SPECIAL_DATADIRS ); |
162 // reading later... |
163 // reading later... |
163 |
164 |
164 } |
165 } |
165 else if(CMseng::IsRemovableDrive(aFsSession, iCurrentScannedDrive)) |
166 else // other drives except Phone Memory should be scanned from root folder. |
166 { |
167 { |
167 theReader.OpenLC( &aResFile, E_DIRECTORIES ); |
168 theReader.OpenLC( &aResFile, E_DIRECTORIES ); |
168 iDirArray = theReader.ReadDesCArrayL(); |
169 iDirArray = theReader.ReadDesCArrayL(); |
169 CleanupStack::PopAndDestroy( &theReader ); |
170 CleanupStack::PopAndDestroy( &theReader ); |
170 // |
171 // |