diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-08-13 22:51:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
| commit | 3750e75f755fbe988af2d9e9c9de5a37fcf51453 (patch) | |
| tree | bec2b64541e17c9297e7eb3448fc5eb9d69857b0 | |
| parent | 37f100ea51857a16a25ba17d4889aec036d17c67 (diff) | |
| parent | 34cc4db180c20569e62db5860c0b206be65b5117 (diff) | |
| download | frameworks_base-3750e75f755fbe988af2d9e9c9de5a37fcf51453.zip frameworks_base-3750e75f755fbe988af2d9e9c9de5a37fcf51453.tar.gz frameworks_base-3750e75f755fbe988af2d9e9c9de5a37fcf51453.tar.bz2 | |
Merge "Move setting to disable automatic USB routing" into lmp-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 20 | ||||
| -rw-r--r-- | media/java/android/media/AudioService.java | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9a41e20..8886559 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2364,16 +2364,6 @@ 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). */ @@ -4745,6 +4735,16 @@ public final class Settings { public static final String TV_INPUT_CUSTOM_LABELS = "tv_input_custom_labels"; /** + * 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"; + + /** * This are the settings to be backed up. * * NOTE: Settings are backed up and restored in the order they appear diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index c6489a6..6d0bfee 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -4618,8 +4618,8 @@ public class AudioService extends IAudioService.Stub { // in SettingsObserver. Here we should log that a USB device is connected // and disconnected with its address (card , device) and force the // connection or disconnection when the setting changes. - int isDisabled = Settings.System.getInt(mContentResolver, - Settings.System.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0); + int isDisabled = Settings.Secure.getInt(mContentResolver, + Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0); if (isDisabled != 0) { return; } |