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

Commit a4daf16b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev

parents 6d42b5c6 fb628c07

core/java/android/provider/Settings.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -6868,14 +6868,6 @@ public final class Settings { 
       public static final String HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED =

       public static final String HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED =

               "hdmi_control_auto_device_off_enabled";

               "hdmi_control_auto_device_off_enabled";





       /**

        * Whether to use the DHCP client from Lollipop and earlier instead of the newer Android DHCP

        * client.

        * (0 = false, 1 = true)

        * @hide

        */

       public static final String LEGACY_DHCP_CLIENT = "legacy_dhcp_client";



       /**

       /**

        * Whether TV will switch to MHL port when a mobile device is plugged in.

        * Whether TV will switch to MHL port when a mobile device is plugged in.

        * (0 = false, 1 = true)

        * (0 = false, 1 = true)

packages/SettingsLib/res/values/strings.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -421,8 +421,6 @@ 
    <string name="wifi_aggressive_handover">Aggressive Wi\u2011Fi to Cellular handover</string>

    <string name="wifi_aggressive_handover">Aggressive Wi\u2011Fi to Cellular handover</string>

    <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->

    <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->

    <string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string>

    <string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string>

    <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->

    <string name="legacy_dhcp_client">Use legacy DHCP client</string>

    <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->

    <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->

    <string name="mobile_data_always_on">Cellular data always active</string>

    <string name="mobile_data_always_on">Cellular data always active</string>

    <!-- Setting Checkbox title for disabling Bluetooth absolute volume -->

    <!-- Setting Checkbox title for disabling Bluetooth absolute volume -->