diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-01-24 18:09:48 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-24 18:11:33 +0000 |
commit | 181dd08b1d3a811f66e629ef61b3ac96de3025b7 (patch) | |
tree | 01a95e2957f023d4a26920eb9b23bcaf8e05c269 /desktop | |
parent | android: initialize security data, and use HOME / bootstrap key (diff) | |
download | core-181dd08b1d3a811f66e629ef61b3ac96de3025b7.tar.gz core-181dd08b1d3a811f66e629ef61b3ac96de3025b7.zip |
android: disable bundled extension synchronisation
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 496a8b9c9242..cf648b4b4fe4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -605,6 +605,7 @@ void Desktop::Init() // Check for lastsynchronized file for bundled extensions in the user directory // and test if synchronzation is necessary! +#ifndef ANDROID { ::rtl::OUString aUserLastSyncFilePathURL = getLastSyncFileURLFromUserInstallation(); ::rtl::OUString aPreregSyncFilePathURL = getLastSyncFileURLFromBrandInstallation(); @@ -620,6 +621,7 @@ void Desktop::Init() copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 ); } } +#endif // We need to have service factory before going further, but see fdo#37195. // Doing this will mmap common.rdb, making it not overwritable on windows, |