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

am: 36b03ec9f0 * commit '36b03ec9f0cd6466f2bd9517a72438e446033685': Back up / restore the 'mono audio' setting Change-Id: I0947760de027c0dfa1fd5f66ea7adfcae9d965a0
2016-05-20 17:16:25 +00:00
parent d9e68cb9af 36b03ec9f0
commit 1500a27af2
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