From cd62f3aed68b35ac6e1f4f7b0594c695663fc8ba Mon Sep 17 00:00:00 2001
From: William Mee <williamm@google.com>
Date: Tue, 24 Jan 2017 18:01:38 -0800
Subject: [PATCH] Added a new wifi_badging_thresholds setting to
 Settings.Global

Requirement is to have a defined default, to be able to override
using GServices, and to access from both platform and GMSCore.

Bug: 34052475
Test: compiles
Change-Id: I1aaa146ea654c3fcef3fdad5084f7bea9fd341ed
---
 api/system-current.txt                   |  1 +
 core/java/android/provider/Settings.java | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index cdd5dab88a600..8c22243ba0474 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -36598,6 +36598,7 @@ package android.provider {
     field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
     field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
     field public static final java.lang.String WEBVIEW_MULTIPROCESS = "webview_multiprocess";
+    field public static final java.lang.String WIFI_BADGING_THRESHOLDS = "wifi_badging_thresholds";
     field public static final java.lang.String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN = "wifi_device_owner_configs_lockdown";
     field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
     field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9e2d4a7b23705..afc4b1fc0695d 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8036,6 +8036,17 @@ public final class Settings {
         */
        public static final String NETWORK_AVOID_BAD_WIFI = "network_avoid_bad_wifi";
 
+       /**
+        * The thresholds of the wifi throughput badging (SD, HD etc.) as a comma-delimited list of
+        * colon-delimited key-value pairs. The key is the badging enum value defined in
+        * android.net.ScoredNetwork and the value is the minimum sustained network throughput in
+        * kbps required for the badge. For example: "10:3000,20:5000,30:25000"
+        *
+        * @hide
+        */
+       @SystemApi
+       public static final String WIFI_BADGING_THRESHOLDS = "wifi_badging_thresholds";
+
        /**
         * Whether Wifi display is enabled/disabled
         * 0=disabled. 1=enabled.