commit f6414d42e42268c2229aab540b4a1ec695780686
author pkanwar <pkanwar@google.com> Wed Nov 30 00:40:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 00:40:22 2016 +0000
tree 5c0565f43cfac20252b83827b387de8440cb5501
parent a034e7b47e00ff024cc15760d7b15566235e63e9
parent 1ec8fe940f866c3baa1dfab3d86bc5cfa40861a2

Allow Carriers to specify Wifi Networks.
am: 1ec8fe940f

Change-Id: I8bd0366bbbfd391af8328cf7bd1a2f81efb9a0d7

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 79c7b9c..941b269 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1049,6 +1049,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;
 
@@ -1231,6 +1237,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);
     }
 
     /**