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

Merge "Initial change on carrier signal filtering" am: bfdce89f36 am: 1507930691

Browse Source 
am: 923046251b

Change-Id: I0762a7787c4136de027f8ee5def592bc85be25b6
This commit is contained in:
Chen Xu
2017-01-20 04:13:03 +00:00
committed by android-build-merger
parent 3465cd9e30 923046251b
commit 038bea5dd1
1 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -844,39 +844,6 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string"; public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string";
/**
* A list of component name of carrier signalling receivers which are interested in intent
* android.intent.action.CARRIER_SIGNAL_REDIRECTED.
* Example:
* <item>com.google.android.carrierPackageName/.CarrierSignalReceiverNameA</item>
* <item>com.google.android.carrierPackageName/.CarrierSignalReceiverNameB</item>
* @hide
*/
public static final String KEY_SIGNAL_REDIRECTION_RECEIVER_STRING_ARRAY =
"signal_redirection_receiver_string_array";
/**
* A list of component name of carrier signalling receivers which are interested in intent
* android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED.
* Example:
* <item>com.google.android.carrierPackageName/.CarrierSignalReceiverNameA</item>
* <item>com.google.android.carrierPackageName/.CarrierSignalReceiverNameB</item>
* @hide
*/
public static final String KEY_SIGNAL_DCFAILURE_RECEIVER_STRING_ARRAY =
"signal_dcfailure_receiver_string_array";
/**
* A list of component name of carrier signalling receivers which are interested in intent
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE.
* Example:
* <item>com.google.android.carrierPackageName/.CarrierSignalReceiverNameA</item>
* <item>com.google.android.carrierPackageName/.CarrierSignalReceiverNameB</item>
* @hide
*/
public static final String KEY_SIGNAL_PCO_RECEIVER_STRING_ARRAY =
"signal_pco_receiver_string_array";
/** /**
* Defines carrier-specific actions which act upon * Defines carrier-specific actions which act upon
* android.intent.action.CARRIER_SIGNAL_REDIRECTED, used for customization of the * android.intent.action.CARRIER_SIGNAL_REDIRECTED, used for customization of the
@@ -929,6 +896,42 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_DEFAULT_REDIRECTION_URL_STRING_ARRAY = public static final String KEY_CARRIER_DEFAULT_REDIRECTION_URL_STRING_ARRAY =
"carrier_default_redirection_url_string_array"; "carrier_default_redirection_url_string_array";
/**
* Each config includes the componentName of the carrier app, followed by a list of interesting
* signals(declared in the manifest) which could wake up the app.
* @see com.android.internal.telephony.TelephonyIntents
* Example:
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverA:
* android.intent.action.CARRIER_SIGNAL_REDIRECTED,
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE
* </item>
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverB:
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE
* </item>
* @hide
*/
public static final String KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY =
"carrier_app_wake_signal_config";
/**
* Each config includes the componentName of the carrier app, followed by a list of interesting
* signals for the app during run-time. The list of signals(intents) are targeting on run-time
* broadcast receivers only, aiming to avoid unnecessary wake-ups and should not be declared in
* the app's manifest.
* @see com.android.internal.telephony.TelephonyIntents
* Example:
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverA:
* android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED,
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE
* </item>
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverB:
* android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED
* </item>
* @hide
*/
public static final String KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY =
"carrier_app_no_wake_signal_config";
/** /**
* Determines whether the carrier supports making non-emergency phone calls while the phone is * Determines whether the carrier supports making non-emergency phone calls while the phone is
* in emergency callback mode. Default value is {@code true}, meaning that non-emergency calls * in emergency callback mode. Default value is {@code true}, meaning that non-emergency calls
@@ -1360,10 +1363,13 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT); sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);
// Carrier Signalling Receivers // Carrier Signalling Receivers
sDefaults.putStringArray(KEY_SIGNAL_REDIRECTION_RECEIVER_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_SIGNAL_DCFAILURE_RECEIVER_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_SIGNAL_PCO_RECEIVER_STRING_ARRAY, null);
sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, ""); sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, "");
sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY,
new String[]{
"com.android.carrierdefaultapp/.CarrierDefaultBroadcastReceiver:" +
"android.intent.action.CARRIER_SIGNAL_REDIRECTED"
});
sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);
// Default carrier app configurations // Default carrier app configurations
sDefaults.putStringArray(KEY_CARRIER_DEFAULT_ACTIONS_ON_REDIRECTION_STRING_ARRAY, sDefaults.putStringArray(KEY_CARRIER_DEFAULT_ACTIONS_ON_REDIRECTION_STRING_ARRAY,