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

Commit 1fd46833 authored by Ben Schwartz's avatar Ben Schwartz Committed by android-build-merger
Browse files

Merge "Add a developer option for controlling DNS over TLS" am: c8207de3 

am: ed97eaeb

Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
parents ecf2bdb4 ed97eaeb

res/xml/development_prefs.xml

+5 −0
Original line number Diff line number Diff line
@@ -257,6 +257,11 @@ 
            android:entries="@array/bluetooth_a2dp_codec_ldac_playback_quality_titles"

            android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />



        <SwitchPreference

            android:key="dns_tls"

            android:title="@string/dns_tls"

            android:summary="@string/dns_tls_summary" />



    </PreferenceCategory>



    <PreferenceCategory android:key="debug_input_category"

src/com/android/settings/development/DevelopmentSettings.java

+12 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    private static final String BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY = "bluetooth_select_a2dp_channel_mode";

    private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY = "bluetooth_select_a2dp_ldac_playback_quality";



    private static final String DNS_TLS_KEY = "dns_tls";



    private static final String INACTIVE_APPS_KEY = "inactive_apps";



    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
@@ -293,6 +295,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    private ListPreference mBluetoothSelectA2dpChannelMode;

    private ListPreference mBluetoothSelectA2dpLdacPlaybackQuality;



    private SwitchPreference mDnsTls;



    private SwitchPreference mOtaDisableAutomaticUpdate;

    private SwitchPreference mWifiAllowScansWithTraffic;

    private SwitchPreference mStrictMode;
@@ -507,6 +511,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        mBluetoothSelectA2dpLdacPlaybackQuality = addListPreference(BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY);

        initBluetoothConfigurationValues();



        mDnsTls = findAndInitSwitchPref(DNS_TLS_KEY);



        mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);

        mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);

        mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
@@ -823,6 +829,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        updateBluetoothDisableAbsVolumeOptions();

        updateBluetoothEnableInbandRingingOptions();

        updateBluetoothA2dpConfigurationValues();

        updateSwitchPreference(mDnsTls, Settings.Global.getInt(cr,

                Settings.Global.DNS_TLS_DISABLED, 0) == 0);

    }



    private void resetDangerousOptions() {
@@ -2526,6 +2534,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
            writeBluetoothDisableAbsVolumeOptions();

        } else if (preference == mBluetoothEnableInbandRinging) {

            writeBluetoothEnableInbandRingingOptions();

        } else if (preference == mDnsTls) {

            Settings.Global.putInt(getActivity().getContentResolver(),

                    Settings.Global.DNS_TLS_DISABLED,

                    mDnsTls.isChecked() ? 0 : 1);

        } else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {

            resetShortcutManagerThrottling();

        } else {