Merge "renaming telephony internal hidden intents" (6d198966) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -817,7 +817,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
		@@ -832,7 +832,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}
		@@ -873,11 +873,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
		*/
		@@ -892,11 +892,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
		*/
		@@ -1301,7 +1301,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);