Merge "Back up / restore the \'mono audio\' setting" into nyc-dev

am: a3aaa5ee25 * commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14': Back up / restore the 'mono audio' setting Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b
2016-05-20 17:11:10 +00:00
parent 80b7ccb67a a3aaa5ee25
commit d33151bf4f
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3573,6 +3573,7 @@ public final class Settings {
            DTMF_TONE_TYPE_WHEN_DIALING,
            HEARING_AID,
            TTY_MODE,
+            MASTER_MONO,
            SOUND_EFFECTS_ENABLED,
            HAPTIC_FEEDBACK_ENABLED,
            POWER_SOUNDS_ENABLED,       // moved to global