Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fb8c37c authored by Amit Mahajan's avatar Amit Mahajan Committed by Android Git Automerger
Browse files

am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 

* commit '7b28e6ec':
  Adding config to allow/disallow user to add APNs.
parents ecf89edf 7b28e6ec

telephony/java/android/telephony/CarrierConfigManager.java

+8 −1
Original line number Diff line number Diff line
@@ -428,6 +428,12 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";



    /**

     * Allow user to add APNs

     * @hide

     */

    public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";



    // These variables are used by the MMS service and exposed through another API, {@link

    // SmsManager}. The variable names and string values are copied from there.

    public static final String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";
@@ -524,6 +530,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, "");

        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, "");

        sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);



        sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);