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

Commit b2402f6e authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED" into nyc-dev 

am: 3dafea31

* commit '3dafea31':
  Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED

Change-Id: I64235eae353ef90f7e3206a649fc3c4978f002b3
parents 72e7feb2 3dafea31

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -3991,6 +3991,7 @@ public final class Settings { 
            MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SAVED_STATE);

            MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS);

            MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED);

            MOVED_TO_GLOBAL.add(Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED);

            MOVED_TO_GLOBAL.add(Settings.Global.WIFI_ENHANCED_AUTO_JOIN);

            MOVED_TO_GLOBAL.add(Settings.Global.WIFI_NETWORK_SHOW_RSSI);

            MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_ON);
@@ -7257,6 +7258,14 @@ public final class Settings { 
       public static final String WIFI_SUSPEND_OPTIMIZATIONS_ENABLED =

               "wifi_suspend_optimizations_enabled";



       /**

        * Setting to enable verbose logging in Wi-Fi; disabled by default, and setting to 1

        * will enable it. In the future, additional values may be supported.

        * @hide

        */

       public static final String WIFI_VERBOSE_LOGGING_ENABLED =

               "wifi_verbose_logging_enabled";



       /**

        * The maximum number of times we will retry a connection to an access

        * point for which we have failed in acquiring an IP address from DHCP.