Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e8af2ab authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "renaming telephony internal hidden intents" am: 6d198966 am: 3b7643ce 

am: 894f17fd

Change-Id: I885615dda1831f0acc9007f81094ac14e1eb8cb6
parents 0c6d24f7 894f17fd

telephony/java/android/telephony/CarrierConfigManager.java

+9 −9
Original line number Diff line number Diff line
@@ -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);