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

Commit 643dc6b8 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Customize the service class for Call barring" am: ce872e98 am:... 

Merge "Customize the service class for Call barring" am: ce872e98 am: cdbb2d7a am: c54ab73e am: 8248366a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404668

Change-Id: Ib41cdfcf5775dd91595c5fe20052826c7010f5d1
parents 76be65ff 8248366a

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -46633,6 +46633,7 @@ package android.telephony { 
    field public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool";

    field public static final String KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY = "apn_settings_default_apn_types_string_array";

    field public static final String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final String KEY_CALL_BARRING_DEFAULT_SERVICE_CLASS_INT = "call_barring_default_service_class_int";

    field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";

    field public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL = "call_barring_supports_password_change_bool";

    field public static final String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool";
@@ -46860,6 +46861,8 @@ package android.telephony { 
    field public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING = "wfc_emergency_address_carrier_app_string";

    field public static final String KEY_WORLD_MODE_ENABLED_BOOL = "world_mode_enabled_bool";

    field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";

    field public static final int SERVICE_CLASS_NONE = 0; // 0x0

    field public static final int SERVICE_CLASS_VOICE = 1; // 0x1

  }















  public static final class CarrierConfigManager.Apn {

























non-updatable-api/current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -44801,6 +44801,7 @@ package android.telephony {













    field public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool";















    field public static final String KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY = "apn_settings_default_apn_types_string_array";















    field public static final String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";













    field public static final String KEY_CALL_BARRING_DEFAULT_SERVICE_CLASS_INT = "call_barring_default_service_class_int";















    field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";















    field public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL = "call_barring_supports_password_change_bool";















    field public static final String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool";










@@ -45028,6 +45029,8 @@ package android.telephony {













    field public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING = "wfc_emergency_address_carrier_app_string";















    field public static final String KEY_WORLD_MODE_ENABLED_BOOL = "world_mode_enabled_bool";















    field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";













    field public static final int SERVICE_CLASS_NONE = 0; // 0x0













    field public static final int SERVICE_CLASS_VOICE = 1; // 0x1















  }





























  public static final class CarrierConfigManager.Apn {

























telephony/java/android/telephony/CarrierConfigManager.java



+26
−0




























Original line number
Diff line number
Diff line








@@ -32,6 +32,7 @@ import android.os.RemoteException;













import android.service.carrier.CarrierService;















import android.telecom.TelecomManager;















import android.telephony.ims.ImsReasonInfo;













import android.telephony.ims.ImsSsData;































import com.android.internal.telephony.ICarrierConfigLoader;















import com.android.telephony.Rlog;










@@ -66,6 +67,18 @@ public class CarrierConfigManager {













    public static final String EXTRA_SUBSCRIPTION_INDEX =















            SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX;





























    /**













     * Service class flag if not specify a service class.













     * Reference: 3GPP TS 27.007 Section 7.4 Facility lock +CLCK













     */













    public static final int SERVICE_CLASS_NONE = ImsSsData.SERVICE_CLASS_NONE;



























    /**













     * Service class flag for voice telephony.













     * Reference: 3GPP TS 27.007 Section 7.4 Facility lock +CLCK













     */













    public static final int SERVICE_CLASS_VOICE = ImsSsData.SERVICE_CLASS_VOICE;





























    private final Context mContext;































    /**










@@ -211,6 +224,18 @@ public class CarrierConfigManager {













    public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL =















            "call_barring_supports_deactivate_all_bool";





























    /**













     * Specifies the service class for call barring service. Default value is













     * {@link #SERVICE_CLASS_VOICE}.













     * The value set as below:













     * <ul>













     * <li>0: {@link #SERVICE_CLASS_NONE}</li>













     * <li>1: {@link #SERVICE_CLASS_VOICE}</li>













     * </ul>













     */













    public static final String KEY_CALL_BARRING_DEFAULT_SERVICE_CLASS_INT =













            "call_barring_default_service_class_int";





























    /**















     * Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED















     * events from the Sim.










@@ -3968,6 +3993,7 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false);















        sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL, true);















        sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL, true);













        sDefaults.putInt(KEY_CALL_BARRING_DEFAULT_SERVICE_CLASS_INT, SERVICE_CLASS_VOICE);















        sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true);















        sDefaults.putBoolean(KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL, true);















        sDefaults.putBoolean(KEY_CALL_FORWARDING_WHEN_UNANSWERED_SUPPORTED_BOOL, true);