summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author tonyzhu <tonyzhu@google.com> 2018-10-11 14:31:26 +0800
committer tonyzhu <tonyzhu@google.com> 2018-10-11 16:45:25 +0800
commitcd0a63d4267ea8b891cd8c1f45b3bcd8d87bed3a (patch)
treec40b1ed453cbafce29450a3bc5d3c4f40f8c26b0
parentafffa372486153292c67d20c48d5756db15fee74 (diff)
[Call Screening]Support for carrier call screening app
Add new Carrier Configuration option to CarrierConfigManager. Bug: 117075906 Test: build success. Change-Id: If61ea78eb4e31a1b92c0b8e2efda5e62ad03ace8
-rwxr-xr-xapi/current.txt1
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java8
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 93fcf3b80a56..8a41c00e5e9e 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -41883,6 +41883,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";
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 6eaecc6760bc..1257a6aeda03 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -1132,6 +1132,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.
*
* If true, then the registered PLMN name (only for CDMA/CDMA-LTE and only when not roaming)
@@ -2328,6 +2335,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);