From 34cc4db180c20569e62db5860c0b206be65b5117 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 13 Aug 2014 10:56:38 -0700 Subject: [PATCH] Move setting to disable automatic USB routing This moves the setting from System to Secure per review. Bug: 16381952 Change-Id: I2497ca66b4f346839490c29295528fac70e94494 --- core/java/android/provider/Settings.java | 20 ++++++++++---------- 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 9a41e20c195c8..888655989e4c7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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. * diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index c6489a63c3fd9..6d0bfee19eeda 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; }