Move setting to disable automatic USB routing
This moves the setting from System to Secure per review.
Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
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 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 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