Merge change 3249 into donut
* changes:
Add new SHOW_WEB_SUGGESTIONS system setting, referenced by the search settings (in a follow-on change). This setting, to be respected by global search, and which I will also file a bug to the browser to respect, determines whether live web suggestions will be shown to the user as they type. For privacy reasons, this could be considered undesirable, as partial queries can then be sent to the user's chosen search engine, so a setting was required.
diff --git a/libs/utils/BackupHelpers.cpp b/libs/utils/BackupHelpers.cpp
index e8e6c45..7f423a8 100644
--- a/libs/utils/BackupHelpers.cpp
+++ b/libs/utils/BackupHelpers.cpp
@@ -350,10 +350,11 @@
FileState& g = newSnapshot.editValueAt(m);
int fd = open(realFilename.string(), O_RDONLY);
- if (fd != -1) {
+ if (fd < 0) {
// We can't open the file. Don't report it as a delete either. Let the
// server keep the old version. Maybe they'll be able to deal with it
// on restore.
+ LOGP("Unable to open file %s - skipping", realFilename.string());
} else {
g.crc32 = compute_crc32(fd);