Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34cc4db1 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Move setting to disable automatic USB routing 

This moves the setting from System to Secure per review.

Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
parent 67241476

core/java/android/provider/Settings.java

+10 −10
Original line number Diff line number Diff line
@@ -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.

         *

media/java/android/media/AudioService.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

                }