am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev

* commit '1b5a2e630a3f7e3787dce2cfd27738ff6232e905': Don't backup/restore ringer mode
2013-10-07 16:59:55 -07:00
parent 783d3c1ed1 1b5a2e630a
commit 1eae610981
1 changed files with 0 additions and 3 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2441,9 +2441,7 @@ public final class Settings {
            SCREEN_BRIGHTNESS_MODE,
            SCREEN_AUTO_BRIGHTNESS_ADJ,
            VIBRATE_INPUT_DEVICES,
-            MODE_RINGER,                // moved to global
            MODE_RINGER_STREAMS_AFFECTED,
-            MUTE_STREAMS_AFFECTED,
            VOLUME_VOICE,
            VOLUME_SYSTEM,
            VOLUME_RING,
@@ -5940,7 +5938,6 @@ public final class Settings {
        public static final String[] SETTINGS_TO_BACKUP = {
            BUGREPORT_IN_POWER_MENU,
            STAY_ON_WHILE_PLUGGED_IN,
-            MODE_RINGER,
            AUTO_TIME,
            AUTO_TIME_ZONE,
            POWER_SOUNDS_ENABLED,