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

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 257f275..1718189 100644 (file)
--- 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,