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

Commit ee31b221 authored by Tony Zhu's avatar Tony Zhu Committed by Gerrit Code Review
Browse files

Merge "[Call Screening]Support for carrier call screening app"

parents a01c77a4 cd0a63d4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41885,6 +41885,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool";

    field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_CALL_SCREENING_APP_STRING = "call_screening_app";

    field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

    field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int";

    field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int";

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1133,6 +1133,13 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";



    /**

     * The Component Name of a carrier-provided CallScreeningService implementation. Telecom will

     * bind to this CallScreeningService for ALL incoming calls and provide the carrier

     * CallScreeningService with the opportunity to allow or block calls.

     */

    public static final String KEY_CARRIER_CALL_SCREENING_APP_STRING = "call_screening_app";



    /**

     * Override the registered PLMN name using #KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING.

     *
@@ -2416,6 +2423,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);

        sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NAME_STRING, "");

        sDefaults.putString(KEY_CARRIER_CALL_SCREENING_APP_STRING, "");

        sDefaults.putBoolean(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING, "");

        sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);