diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-08-07 19:07:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-07 19:07:37 +0000 |
| commit | 4552829ae0b89c323fd1b9f773b68eb56f069e53 (patch) | |
| tree | c7540adecd241cba853367355f2a07695a26c870 /core/java/android | |
| parent | 4d72ebe6427bf1e7b85dd0772fc6fb78385fcea9 (diff) | |
| parent | 27ee1046a49854f6696f390d2869d3bb81449a24 (diff) | |
| download | frameworks_base-4552829ae0b89c323fd1b9f773b68eb56f069e53.zip frameworks_base-4552829ae0b89c323fd1b9f773b68eb56f069e53.tar.gz frameworks_base-4552829ae0b89c323fd1b9f773b68eb56f069e53.tar.bz2 | |
am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev
* commit 'fc7524257aedf685908528c778843294d4e07da1':
Add setting to disable automatic USB audio routing
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index de1df56..733ab32 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2375,6 +2375,16 @@ public final class Settings { public static final String VIBRATE_WHEN_RINGING = "vibrate_when_ringing"; /** + * Whether automatic routing of system audio to USB audio peripheral is disabled. + * The value is boolean (1 or 0), where 1 means automatic routing is disabled, + * and 0 means automatic routing is enabled. + * + * @hide + */ + public static final String USB_AUDIO_AUTOMATIC_ROUTING_DISABLED = + "usb_audio_automatic_routing_disabled"; + + /** * Whether the audible DTMF tones are played by the dialer when dialing. The value is * boolean (1 or 0). */ |