commit c87140c940143d6977b7fcb82235d5a11b4089a6
author SongFerngWang <songferngwang@google.com> Mon Aug 19 22:51:46 2019 +0800
committer SongFerng Wang <songferngwang@google.com> Tue Aug 20 13:31:27 2019 +0000
tree 2989c15fb02c9501f35406e14c5fd2528dba05fb
parent b532faa7c992d6e95167a844d124ed90d49784dc

Create carrier config to define specific default value of APN types.

Create Carrier config for default value of APN types field if not specified by
user when adding/modifying an APN.

Bug: 139320184
Test: Enter empty APN type and check if only default is added into
APN.
Change-Id: Ie6984e4eb741b1ac0a245b40e7102cc2c0c25b20

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index cb7014e..0b4e8e8 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1375,6 +1375,13 @@
             "read_only_apn_fields_string_array";
 
     /**
+     * Default value of APN types field if not specified by user when adding/modifying an APN.
+     * @hide
+     */
+    public static final String KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY =
+            "apn_settings_default_apn_types_string_array";
+
+    /**
      * Boolean indicating if intent for emergency call state changes should be broadcast
      * @hide
      */
@@ -3191,6 +3198,7 @@
         sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);
         sDefaults.putStringArray(KEY_READ_ONLY_APN_TYPES_STRING_ARRAY, new String[] {"dun"});
         sDefaults.putStringArray(KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY, null);
+        sDefaults.putStringArray(KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY, null);
         sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);
         sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);
         sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);