Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "support per carrier based iso country code." am: 79db2b093a

Browse Source 
am: ee4cfc350d

Change-Id: I511bcc5ed4153621194097ce1dfa97efcf8e3f02
This commit is contained in:
Chen Xu
2018-12-05 11:00:45 -08:00
committed by android-build-merger
parent 29ce4d5fda ee4cfc350d
commit 4988e08c6d
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1154,20 +1154,33 @@ 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 {@link android.telecom.CallScreeningService} for ALL incoming calls and provide
* the carrier
* CallScreeningService with the opportunity to allow or block calls.
* <p>
* The String includes the package name/the class name.
* Example:
* <item>com.android.carrier/com.android.carrier.callscreeningserviceimpl</item>
* <p>
* Using {@link ComponentName#flattenToString()} to convert a ComponentName object to String.
* Using {@link ComponentName#unflattenFromString(String)} to convert a String object to a
* ComponentName.
*/
/**
* String to override sim country iso.
* Sim country iso is based on sim MCC which is coarse and doesn't work with dual IMSI SIM where
* a SIM can have multiple MCC from different countries.
* Instead, each sim carrier should have a single country code, apply per carrier based iso
* code as an override. The overridden value can be read from
* {@link TelephonyManager#getSimCountryIso()} and {@link SubscriptionInfo#getCountryIso()}
*
* @hide
*/
public static final String KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING =
"sim_country_iso_override_string";
/**
* The Component Name of a carrier-provided CallScreeningService implementation. Telecom will
* bind to {@link android.telecom.CallScreeningService} for ALL incoming calls and provide
* the carrier
* CallScreeningService with the opportunity to allow or block calls.
* <p>
* The String includes the package name/the class name.
* Example:
* <item>com.android.carrier/com.android.carrier.callscreeningserviceimpl</item>
* <p>
* Using {@link ComponentName#flattenToString()} to convert a ComponentName object to String.
* Using {@link ComponentName#unflattenFromString(String)} to convert a String object to a
* ComponentName.
*/
public static final String KEY_CARRIER_CALL_SCREENING_APP_STRING = "call_screening_app";
/**
@@ -2495,6 +2508,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_SIM_COUNTRY_ISO_OVERRIDE_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, "");

7
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -406,6 +406,13 @@ public class SubscriptionManager {
*/
public static final String MNC = "mnc";
/**
* TelephonyProvider column name for the iso country code associated with a SIM.
* <P>Type: TEXT (String)</P>
* @hide
*/
public static final String ISO_COUNTRY_CODE = "iso_country_code";
/**
* TelephonyProvider column name for the sim provisioning status associated with a SIM.
* <P>Type: INTEGER (int)</P>