From d25253ed61b6e9f20ea1e47587c21a7436dc1c68 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Thu, 24 Jan 2019 16:58:47 -0800
Subject: [PATCH 1/2] Link Probing: Add feature flag

Link probing is disabled by default, enable it using
'adb shell settings put global wifi_link_probing_enabled 1'

Bug: 112029045
Test: atest SettingsBackupTest
Test: Manually check logs that link probing is not occurring when
disabled, and link probing occurs when enabled.

Change-Id: I43ceef59f5e3c76a229cb714e85d01ad16fe300e
---
 core/java/android/provider/Settings.java            | 13 +++++++++++++
 .../src/android/provider/SettingsBackupTest.java    |  1 +
 2 files changed, 14 insertions(+)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index b2c2d0e20d649..b80dc57d35f55 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10515,6 +10515,18 @@ public final class Settings {
         private static final Validator WIFI_PNO_RECENCY_SORTING_ENABLED_VALIDATOR =
                 BOOLEAN_VALIDATOR;
 
+        /**
+         * Setting to enable the Wi-Fi link probing.
+         * Disabled by default, and setting it to 1 will enable it.
+         * The value is boolean (0 or 1).
+         * @hide
+         */
+        public static final String WIFI_LINK_PROBING_ENABLED =
+                "wifi_link_probing_enabled";
+
+        private static final Validator WIFI_LINK_PROBING_ENABLED_VALIDATOR =
+                BOOLEAN_VALIDATOR;
+
        /**
         * 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.
@@ -13221,6 +13233,7 @@ public final class Settings {
                     WIFI_PNO_FREQUENCY_CULLING_ENABLED_VALIDATOR);
             VALIDATORS.put(WIFI_PNO_RECENCY_SORTING_ENABLED,
                     WIFI_PNO_RECENCY_SORTING_ENABLED_VALIDATOR);
+            VALIDATORS.put(WIFI_LINK_PROBING_ENABLED, WIFI_LINK_PROBING_ENABLED_VALIDATOR);
         }
 
         /**
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 87ad3d1067b2d..a0387bed68311 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -521,6 +521,7 @@ public class SettingsBackupTest {
                     Settings.Global.WIFI_LINK_SPEED_METRICS_ENABLED,
                     Settings.Global.WIFI_PNO_FREQUENCY_CULLING_ENABLED,
                     Settings.Global.WIFI_PNO_RECENCY_SORTING_ENABLED,
+                    Settings.Global.WIFI_LINK_PROBING_ENABLED,
                     Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT,
                     Settings.Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS,
                     Settings.Global.WIFI_NETWORK_SHOW_RSSI,

From 3b618e6b5007ed8009a0565a032e0a8462506697 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Fri, 25 Jan 2019 16:26:31 -0800
Subject: [PATCH 2/2] Link Probing: Add overlay flag to disable feature by
 default

Disables link probing by default due to some devices not supporting the
nl80211 command. Selectively enabled feature on devices where the
command was confirmed to work.

Bug: 112029045
Test: compiles
Change-Id: I4494fbae9928fd16f36daec6d633e65c3584ce47
---
 core/res/res/values/config.xml  | 3 +++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 44b2c31cbe434..d669851c6b60a 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -701,6 +701,9 @@
     <!-- Indicates that connected MAC randomization is supported on this device -->
     <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">false</bool>
 
+    <!-- Indicates that wifi link probing is supported on this device -->
+    <bool translatable="false" name="config_wifi_link_probing_supported">false</bool>
+
     <!-- Flag indicating whether we should enable the automatic brightness.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">false</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 11fc66a7535a6..216bd0560e27b 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1882,6 +1882,7 @@
   <java-symbol type="bool" name="config_wifi_convert_apband_5ghz_to_any" />
   <java-symbol type="bool" name="config_wifi_local_only_hotspot_5ghz" />
   <java-symbol type="bool" name="config_wifi_connected_mac_randomization_supported" />
+  <java-symbol type="bool" name="config_wifi_link_probing_supported" />
   <java-symbol type="bool" name="config_wifi_fast_bss_transition_enabled" />
   <java-symbol type="bool" name="config_wimaxEnabled" />
   <java-symbol type="bool" name="show_ongoing_ime_switcher" />