Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0e5326d authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 

* commit 'a46a5cba':
  DO NOT MERGE No backup of country and sleep policy
parents 63a4f9f5 a46a5cba

core/java/android/provider/Settings.java

+0 −2
Original line number Diff line number Diff line
@@ -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,