Merge changes I0f997d30,I288ba1f4 am: 53f8591789 am: bc3c6b1314

am: 755c78a8dd Change-Id: If6773e2c3a09d9967f4767c0512e6746b6b44196
2018-09-30 20:11:13 -07:00
parent adc64e4704 755c78a8dd
commit cc7594fe68
4 changed files with 38 additions and 16 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9604,8 +9604,7 @@ public final class Settings {
         * Use the old dnsmasq DHCP server for tethering instead of the framework implementation.
         *
         * Integer values are interpreted as boolean, and the absence of an explicit setting
-         * is interpreted as |true|.
-         * TODO: make the default |false|
+         * is interpreted as |false|.
         * @hide
         */
        public static final String TETHER_ENABLE_LEGACY_DHCP_SERVER =