Merge change 3265 into donut
* changes:
A workaround to fix rotation issue. I'm remote now and hard to do troubleshooting (i cannot rotate emulator in nx..)
diff --git a/api/current.xml b/api/current.xml
index 174fa10..9e29152 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -108328,6 +108328,17 @@
visibility="public"
>
</field>
+<field name="SHOW_WEB_SUGGESTIONS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value=""show_web_suggestions""
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="SOUND_EFFECTS_ENABLED"
type="java.lang.String"
transient="false"
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 5d10675..7ec3be6 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1276,6 +1276,14 @@
* boolean (1 or 0).
*/
public static final String HAPTIC_FEEDBACK_ENABLED = "haptic_feedback_enabled";
+
+ /**
+ * Whether live web suggestions while the user types into search dialogs are
+ * enabled. Browsers and other search UIs should respect this, as it allows
+ * a user to avoid sending partial queries to a search engine, if it poses
+ * any privacy concern. The value is boolean (1 or 0).
+ */
+ public static final String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";
// Settings moved to Settings.Secure
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);