summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Irfan Sheriff <isheriff@google.com> 2011-02-23 13:47:24 -0800
committer Irfan Sheriff <isheriff@google.com> 2011-02-23 13:51:52 -0800
commitae388dac6d4bcee056c1388acc37a7b7cda8792f (patch)
tree17bb7a5823c76fceb1d26272826e3170007889bd
parent2788e4f96a3f210192145a340a1d072c70c7bc4f (diff)
DO NOT MERGE No backup of country and sleep policy
Remove country code and sleep policy setting back up as it is a device specific setting Bug: 3481068 Change-Id: Ifc824c1cd3c3706f8cdaf09b06a05a0c94243acb
-rw-r--r--core/java/android/provider/Settings.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 257f275b2c1e..1718189d8065 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1797,7 +1797,6 @@ public final class Settings {
*/
public static final String[] SETTINGS_TO_BACKUP = {
STAY_ON_WHILE_PLUGGED_IN,
- WIFI_SLEEP_POLICY,
WIFI_USE_STATIC_IP,
WIFI_STATIC_IP,
WIFI_STATIC_GATEWAY,
@@ -3704,7 +3703,6 @@ public final class Settings {
TTS_ENABLED_PLUGINS,
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
- WIFI_COUNTRY_CODE,
WIFI_NUM_OPEN_NETWORKS_KEPT,
MOUNT_PLAY_NOTIFICATION_SND,
MOUNT_UMS_AUTOSTART,