Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev

Browse Source 
* commit '1666a7c5a654ae2f44e1e0d3083dd25720f42778':
  Move setting to disable automatic USB routing
This commit is contained in:
Glenn Kasten
2014-08-13 22:56:11 +00:00
committed by Android Git Automerger
parent 9dbdbb57a9 3750e75f75
commit cfd12009e4
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/provider/Settings.java
View File

@@ -2363,16 +2363,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).
@@ -4744,6 +4734,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.
*

4
media/java/android/media/AudioService.java
View File

@@ -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;
}