commit 1ec8fe940f866c3baa1dfab3d86bc5cfa40861a2
author pkanwar <pkanwar@google.com> Wed Nov 23 11:20:30 2016 -0800
committer pkanwar <pkanwar@google.com> Mon Nov 28 09:18:02 2016 -0800
tree 40c87d2c0108c81234ff484f7ae2d5c6891e04dc
parent 52a35420969644e5497ca50afe9f2015b9f69cf5

Allow Carriers to specify Wifi Networks.

Bug: 31003437
Change-Id: I661f8fc9924e677b9ac08c70500bd175d30834fa

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 583f851..fb67fcb 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1004,6 +1004,12 @@
     public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL =
             "editable_wfc_roaming_mode_bool";
 
+    /**
+     * Carrier specified WiFi networks.
+     * @hide
+     */
+    public static final String KEY_CARRIER_WIFI_STRING_ARRAY = "carrier_wifi_string_array";
+
     /** The default value for every variable. */
     private final static PersistableBundle sDefaults;
 
@@ -1181,6 +1187,7 @@
         sDefaults.putStringArray(FILTERED_CNAP_NAMES_STRING_ARRAY, null);
         sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);
         sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);
+        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);
     }
 
     /**