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

Merge "renaming telephony internal hidden intents"

Browse Source 
am: 6d198966fe

Change-Id: If1db829fe5308bcbc1d8b778aef50368581850f4
This commit is contained in:
Chen Xu
2017-02-24 02:33:53 +00:00
committed by android-build-merger
parent 029170ee2b 6d198966fe
commit 3b7643ceed
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -867,7 +867,7 @@ public class CarrierConfigManager {
/** /**
* 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 * com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED, used for customization of the
* default carrier app * default carrier app
* Format: "CARRIER_ACTION_IDX, ..." * Format: "CARRIER_ACTION_IDX, ..."
* Where {@code CARRIER_ACTION_IDX} is an integer defined in * Where {@code CARRIER_ACTION_IDX} is an integer defined in
@@ -882,7 +882,7 @@ public class CarrierConfigManager {
/** /**
* Defines carrier-specific actions which act upon * Defines carrier-specific actions which act upon
* android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED * com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED
* and configured signal args: * and configured signal args:
* {@link com.android.internal.telephony.TelephonyIntents#EXTRA_APN_TYPE_KEY apnType}, * {@link com.android.internal.telephony.TelephonyIntents#EXTRA_APN_TYPE_KEY apnType},
* {@link com.android.internal.telephony.TelephonyIntents#EXTRA_ERROR_CODE_KEY errorCode} * {@link com.android.internal.telephony.TelephonyIntents#EXTRA_ERROR_CODE_KEY errorCode}
@@ -923,11 +923,11 @@ public class CarrierConfigManager {
* @see com.android.internal.telephony.TelephonyIntents * @see com.android.internal.telephony.TelephonyIntents
* Example: * Example:
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverA: * <item>com.google.android.carrierAPK/.CarrierSignalReceiverA:
* android.intent.action.CARRIER_SIGNAL_REDIRECTED, * com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED,
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE * com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE
* </item> * </item>
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverB: * <item>com.google.android.carrierAPK/.CarrierSignalReceiverB:
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE * com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE
* </item> * </item>
* @hide * @hide
*/ */
@@ -942,11 +942,11 @@ public class CarrierConfigManager {
* @see com.android.internal.telephony.TelephonyIntents * @see com.android.internal.telephony.TelephonyIntents
* Example: * Example:
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverA: * <item>com.google.android.carrierAPK/.CarrierSignalReceiverA:
* android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED, * com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED,
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE * com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE
* </item> * </item>
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverB: * <item>com.google.android.carrierAPK/.CarrierSignalReceiverB:
* android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED * com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED
* </item> * </item>
* @hide * @hide
*/ */
@@ -1392,7 +1392,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY, sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY,
new String[]{ new String[]{
"com.android.carrierdefaultapp/.CarrierDefaultBroadcastReceiver:" + "com.android.carrierdefaultapp/.CarrierDefaultBroadcastReceiver:" +
"android.intent.action.CARRIER_SIGNAL_REDIRECTED" "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED"
}); });
sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY, null);