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

Merge "renaming telephony internal hidden intents" am: 6d198966fe am: 3b7643ceed

Browse Source 
am: 894f17fdc0

Change-Id: I885615dda1831f0acc9007f81094ac14e1eb8cb6
This commit is contained in:
Chen Xu
2017-02-24 02:44:03 +00:00
committed by android-build-merger
parent 0c6d24f736 894f17fdc0
commit 5e8af2abc7
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

@@ -942,7 +942,7 @@ public class CarrierConfigManager {
/**
* 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
* Format: "CARRIER_ACTION_IDX, ..."
* Where {@code CARRIER_ACTION_IDX} is an integer defined in
@@ -957,7 +957,7 @@ public class CarrierConfigManager {
/**
* 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:
* {@link com.android.internal.telephony.TelephonyIntents#EXTRA_APN_TYPE_KEY apnType},
* {@link com.android.internal.telephony.TelephonyIntents#EXTRA_ERROR_CODE_KEY errorCode}
@@ -998,11 +998,11 @@ public class CarrierConfigManager {
* @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
* com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED,
* com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE
* </item>
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverB:
* android.intent.action.CARRIER_SIGNAL_PCO_VALUE
* com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE
* </item>
* @hide
*/
@@ -1017,11 +1017,11 @@ public class CarrierConfigManager {
* @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
* com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED,
* com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE
* </item>
* <item>com.google.android.carrierAPK/.CarrierSignalReceiverB:
* android.intent.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED
* com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED
* </item>
* @hide
*/
@@ -1493,7 +1493,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_CARRIER_APP_WAKE_SIGNAL_CONFIG_STRING_ARRAY,
new String[]{
"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);